SHARE
TWEET

Untitled

a guest Apr 23rd, 2018 65 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. From fd656bf488bc3c58a62b13067e18621c498f02ed Mon Sep 17 00:00:00 2001
  2. From: 0140454 <s1994928@yahoo.com.tw>
  3. Date: Mon, 23 Apr 2018 23:23:21 +0800
  4. Subject: [PATCH 1/2] Set OPENSSL_INCLUDE_DIR to ensure cmake detecting correct
  5.  version
  6.  
  7. ---
  8. build-all-arch.sh | 2 +-
  9.  1 file changed, 1 insertion(+), 1 deletion(-)
  10.  
  11. diff --git a/build-all-arch.sh b/build-all-arch.sh
  12. index 8d5e48dc..f1e8fe00 100755
  13. --- a/build-all-arch.sh
  14. +++ b/build-all-arch.sh
  15. @@ -44,7 +44,7 @@ for arch in ${archs[@]}; do
  16.     mkdir -p $OUTPUT_DIR
  17.     cd $OUTPUT_DIR
  18.  
  19. -   PATH=/opt/android/tool/$arch/$target_host/bin:/opt/android/tool/$arch/bin:$PATH CC=clang CXX=clang++ cmake -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH="$xarch" -D STATIC=ON -D BUILD_64=$sixtyfour -D CMAKE_BUILD_TYPE=$build_type -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/build/boost/$arch -D BOOST_LIBRARYDIR=/opt/android/build/boost/$arch/lib -D OPENSSL_ROOT_DIR=/opt/android/build/openssl/$arch -D OPENSSL_CRYPTO_LIBRARY=/opt/android/build/openssl/$arch/lib/libcrypto.so -D OPENSSL_SSL_LIBRARY=/opt/android/build/openssl/$arch/lib/libssl.so -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../..
  20. +   PATH=/opt/android/tool/$arch/$target_host/bin:/opt/android/tool/$arch/bin:$PATH CC=clang CXX=clang++ cmake -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH="$xarch" -D STATIC=ON -D BUILD_64=$sixtyfour -D CMAKE_BUILD_TYPE=$build_type -D ANDROID=true -D BUILD_TAG="android" -D BOOST_ROOT=/opt/android/build/boost/$arch -D BOOST_LIBRARYDIR=/opt/android/build/boost/$arch/lib -D OPENSSL_ROOT_DIR=/opt/android/build/openssl/$arch -D OPENSSL_INCLUDE_DIR=/opt/android/build/openssl/$arch -D OPENSSL_CRYPTO_LIBRARY=/opt/android/build/openssl/$arch/lib/libcrypto.so -D OPENSSL_SSL_LIBRARY=/opt/android/build/openssl/$arch/lib/libssl.so -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../..
  21.     make -j4 wallet_api
  22.     find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;
  23.  
  24. --
  25. 2.14.1
  26.  
  27.  
  28. From d8aedb205b249d16d038683af788740b5074f265 Mon Sep 17 00:00:00 2001
  29. From: 0140454 <s1994928@yahoo.com.tw>
  30. Date: Mon, 23 Apr 2018 23:25:38 +0800
  31. Subject: [PATCH 2/2] Suppress 'user-defined-warnings'
  32.  
  33. ---
  34. CMakeLists.txt | 2 +-
  35.  1 file changed, 1 insertion(+), 1 deletion(-)
  36.  
  37. diff --git a/CMakeLists.txt b/CMakeLists.txt
  38. index f2350281..8a029354 100644
  39. --- a/CMakeLists.txt
  40. +++ b/CMakeLists.txt
  41. @@ -489,7 +489,7 @@ else()
  42.    else()
  43.      set(ARCH_FLAG "-march=${ARCH}")
  44.    endif()
  45. -  set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-variable -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
  46. +  set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-variable -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wno-error=user-defined-warnings")
  47.    if(NOT MINGW)
  48.      set(WARNINGS_AS_ERRORS_FLAG "-Werror")
  49.    endif()
  50. --
  51. 2.14.1
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
Top