Merge pull request #71 from opengisch/shared

Shared
opengisch · Aug 28, 2020 · e83cf01 · e83cf01
2 parents eaacdce + 41a0132
commit e83cf01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/distribute.sh b/distribute.sh
@@ -193,7 +193,7 @@ function push_arm() {
   export CFLAGS="$CFLAGS -isystem $ANDROIDNDK/sysroot/usr/include -isystem $ANDROIDNDK/sysroot/usr/include/$TOOLCHAIN_SHORT_PREFIX"
   export CFLAGS="$CFLAGS -D__ANDROID_API__=$ANDROIDAPI"
 
-  export CXXFLAGS="$CFLAGS"
+  export CXXFLAGS="$CFLAGS -stdlib=libc++"
   export CPPFLAGS="$CFLAGS"
 
   if [ "X${ARCH}" == "Xarmeabi-v7a" ]; then
@@ -211,7 +211,7 @@ function push_arm() {
     ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$QT_ANDROID/lib"
     ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$ANDROIDNDK/platforms/android-$ANDROIDAPI/arch-$QT_ARCH_PREFIX/usr/lib"
     ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH"
-    export LDFLAGS="-Wl,-rpath=$STAGE_PATH/lib $LDFLAGS"
+    export LDFLAGS="-Wl,-rpath=$STAGE_PATH/lib -Wl,-rpath=$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH $LDFLAGS"
   fi
   export PATH="$ANDROIDNDK/toolchains/llvm/prebuilt/$PYPLATFORM-x86_64/bin/:$ANDROIDSDK/tools:$ANDROIDNDK:$QT_ANDROID/bin:$PATH"
 
@@ -239,7 +239,7 @@ function push_arm() {
   export CMAKECMD="$CMAKECMD -DANDROID_LINKER_FLAGS=$ANDROID_CMAKE_LINKER_FLAGS"
   export CMAKECMD="$CMAKECMD -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$ANDROIDNDK/build/cmake/android.toolchain.cmake"
   export CMAKECMD="$CMAKECMD -DCMAKE_FIND_ROOT_PATH:PATH=$ANDROID_NDK;$QT_ANDROID;$BUILD_PATH;$STAGE_PATH"
-  export CMAKECMD="$CMAKECMD -DANDROID_ABI=$ARCH -DANDROID_NDK=$ANDROID_NDK -DANDROID_NATIVE_API_LEVEL=$ANDROIDAPI -DANDROID=ON"
+  export CMAKECMD="$CMAKECMD -DANDROID_ABI=$ARCH -DANDROID_NDK=$ANDROID_NDK -DANDROID_NATIVE_API_LEVEL=$ANDROIDAPI -DANDROID=ON -DANDROID_STL=c++_shared"
 
 
   # export environment for Qt

diff --git a/recipes/qtkeychain/recipe.sh b/recipes/qtkeychain/recipe.sh
@@ -50,13 +50,7 @@ function build_qtkeychain() {
 
  # configure
  try $CMAKECMD \
-  -DQT4_BUILD=OFF \
-  -DQCA_SUFFIX=qt5 \
   -DCMAKE_INSTALL_PREFIX:PATH=$STAGE_PATH \
-  -DBUILD_TESTS=OFF \
-  -DBUILD_TOOLS=OFF \
-  -DWITH_nss_PLUGIN=OFF \
-  -DWITH_pkcs11_PLUGIN=OFF \
   $BUILD_qtkeychain
 
   try $MAKESMP VERBOSE=1 install