Updated the client for linux
This commit is contained in:
		
							parent
							
								
									38c8c7a377
								
							
						
					
					
						commit
						7aa8c310d9
					
				
							
								
								
									
										2
									
								
								client
									
									
									
									
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										2
									
								
								client
									
									
									
									
									
								
							| @ -1 +1 @@ | |||||||
| Subproject commit 6393d79f54a1a13300c5117bd3eecd44b909ecc3 | Subproject commit 24c6c4d32c23ea51c547ae0ecd13e66cd2587e4e | ||||||
							
								
								
									
										2
									
								
								third_party/Thread-Pool
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										2
									
								
								third_party/Thread-Pool
									
									
									
									
										vendored
									
									
								
							| @ -1 +1 @@ | |||||||
| Subproject commit d858eb8b3aec7f9d2e9d308d0564a8a267710f64 | Subproject commit df14b580d9f15d7a0b16a8bfc8b906f2608d192c | ||||||
							
								
								
									
										4
									
								
								third_party/build_boringssl.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								third_party/build_boringssl.sh
									
									
									
									
										vendored
									
									
								
							| @ -21,8 +21,10 @@ if [[ ${build_os_type} == "linux" ]]; then | |||||||
| 
 | 
 | ||||||
|     cd boringssl/ |     cd boringssl/ | ||||||
|     [[ $? -ne 0 ]] && exit 1 |     [[ $? -ne 0 ]] && exit 1 | ||||||
|     [[ -d lib ]] && rm -r lib |     [[ -d lib ]] && { | ||||||
|  | 	rm -r lib | ||||||
| 	[[ $? -ne 0 ]] && exit 2 | 	[[ $? -ne 0 ]] && exit 2 | ||||||
|  |     } | ||||||
| 
 | 
 | ||||||
|     mkdir lib && cd lib |     mkdir lib && cd lib | ||||||
|     ln -s ../build/ssl/libssl.so . |     ln -s ../build/ssl/libssl.so . | ||||||
|  | |||||||
							
								
								
									
										11
									
								
								third_party/build_unbound.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								third_party/build_unbound.sh
									
									
									
									
										vendored
									
									
								
							| @ -31,15 +31,12 @@ if [[ -d ${build_path} ]]; then | |||||||
|     rm -r ${build_path} |     rm -r ${build_path} | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| mkdir -p ${build_path} | cd ${library_path} | ||||||
| check_err_exit ${library_path} "Failed to create build directory" |  | ||||||
| cd ${build_path} |  | ||||||
| check_err_exit ${library_path} "Failed to enter build directory" |  | ||||||
| 
 |  | ||||||
| if [[ ${build_os_type} == "linux" ]]; then | if [[ ${build_os_type} == "linux" ]]; then | ||||||
| 	#Failed to build with BoringSSL, so we using openssl. No ABI stuff should be changed! | 	#Failed to build with BoringSSL, so we using openssl. No ABI stuff should be changed! | ||||||
| 	# --with-ssl=${library_boringssl} | 	# --with-ssl=${library_boringssl} | ||||||
| 	../../configure --with-libunbound-only --with-libevent=${library_event} --enable-event-api --enable-shared=yes --enable-static=yes --with-pthreads --prefix=`pwd` |         echo "Install build to ${build_path}" | ||||||
|  | 	./configure --prefix="${build_path}" --with-libunbound-only --with-libevent=${library_event} --enable-event-api --enable-shared=yes --enable-static=yes --with-pthreads | ||||||
| 	check_err_exit ${library_path} "Failed to configure build" | 	check_err_exit ${library_path} "Failed to configure build" | ||||||
| 	make CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS} -fPIC" ${MAKE_OPTIONS} | 	make CXXFLAGS="${CXX_FLAGS}" CFLAGS="${C_FLAGS} -fPIC" ${MAKE_OPTIONS} | ||||||
| 	check_err_exit ${library_path} "Failed to build" | 	check_err_exit ${library_path} "Failed to build" | ||||||
| @ -49,7 +46,7 @@ else | |||||||
|     echo "Invalid OS!" |     echo "Invalid OS!" | ||||||
|     exit 1 |     exit 1 | ||||||
| fi | fi | ||||||
| cd ../../../ | cd ../ | ||||||
| 
 | 
 | ||||||
| set_build_successful ${library_path} | set_build_successful ${library_path} | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user