Updated library refs
This commit is contained in:
@@ -69,3 +69,6 @@
|
||||
[submodule "libraries/glibc"]
|
||||
path = libraries/glibc
|
||||
url = https://git.did.science/WolverinDEV/glibc-prebuild.git
|
||||
[submodule "libraries/openssl-prebuild"]
|
||||
path = libraries/openssl-prebuild
|
||||
url = https://git.did.science/WolverinDEV/openssl-prebuild.git
|
||||
|
||||
+1
-1
Submodule libraries/DataPipes updated: 978e688b7b...eb59bcfc53
Submodule libraries/boringssl deleted from 1cc95ac07c
@@ -60,7 +60,6 @@ function exec_script_external() {
|
||||
}
|
||||
|
||||
exec_script_external build_libevent.sh event
|
||||
exec_script_external build_boringssl.sh boringssl
|
||||
exec_script_external build_breakpad.sh breakpad
|
||||
exec_script_external build_cxxterminal.sh CXXTerminal "libevent_path=event"
|
||||
exec_script build_datapipes.sh DataPipes
|
||||
|
||||
@@ -11,5 +11,5 @@ fi
|
||||
|
||||
cd build
|
||||
../configure
|
||||
make CXXFLAGS="-std=c++11 -I../../boringssl/include/ ${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${MAKE_OPTIONS}
|
||||
make CXXFLAGS="-std=c++11 ${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${MAKE_OPTIONS}
|
||||
sudo make install
|
||||
|
||||
@@ -57,7 +57,8 @@ _cxx_options=""
|
||||
[[ ${build_os_type} == "win32" ]] && _cxx_options="-DWIN32"
|
||||
|
||||
general_options="-DCMAKE_C_FLAGS=\"-fPIC\" -DCMAKE_CXX_FLAGS=\"$_cxx_options\" -DBUILD_TESTS=OFF -DBUILD_STATIC=0 -DBUILD_SHARED=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
|
||||
crypto_options="-DCrypto_ROOT_DIR=\"$(pwd)/boringssl/lib/\" -DCRYPTO_TYPE=\"boringssl\""
|
||||
#crypto_options="-DCrypto_ROOT_DIR=\"$(pwd)/boringssl/lib/\" -DCRYPTO_TYPE=\"boringssl\""
|
||||
crypto_options="-DCRYPTO_TYPE=\"openssl\" -DCrypto_ROOT_DIR=\"$(pwd)/openssl-prebuild/${build_os_type}_${build_os_arch}/\""
|
||||
|
||||
command="cmake_build ${library_path} ${general_options} ${crypto_options} ${web_cmake_flags} ${CMAKE_OPTIONS}"
|
||||
eval "$command"
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
cd ed25519/build/
|
||||
cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
||||
#cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
||||
cmake .. -DCMAKE_C_FLAGS="-fPIC ${C_FLAGS}" -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
||||
make ${CMAKE_MAKE_OPTIONS}
|
||||
sudo make install
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
cd event/build/
|
||||
cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
||||
#cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
||||
cmake .. -DCMAKE_C_FLAGS="-fPIC ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
|
||||
make ${CMAKE_MAKE_OPTIONS}
|
||||
sudo make install
|
||||
|
||||
+1
-1
Submodule libraries/libnice updated: 6ca5739b63...f33e8148d3
Submodule
+1
Submodule libraries/openssl-prebuild added at 8171e85754
Reference in New Issue
Block a user