From ea9a3d045fb0384cfbdf7fcfa65b1e02e8bae3a5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 18 Oct 2018 21:45:38 +0200
Subject: [PATCH] Fix buildflags for android-boost and android-cppunit

---
 boost/android-arm64-v8a/PKGBUILD                 | 16 +++++++---------
 .../PKGBUILD                                     | 11 ++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)
 rename cppunit/{android-amd64v8a => android-arm64-v8a}/PKGBUILD (95%)

diff --git a/boost/android-arm64-v8a/PKGBUILD b/boost/android-arm64-v8a/PKGBUILD
index a30cc363..9c6e9c8f 100644
--- a/boost/android-arm64-v8a/PKGBUILD
+++ b/boost/android-arm64-v8a/PKGBUILD
@@ -51,16 +51,13 @@ build() {
     -funwind-tables \
     -no-canonical-prefixes \
     -D__ANDROID_API__=$_android_api_level \
-    -DBOOST_ASIO_HAS_STD_STRING_VIEW=1 \
-    -D_FORTIFY_SOURCE=2 \
-    -pipe \
-    -fstack-protector-strong \
-    --param=ssp-buffer-size=4 \
-    -fPIE -fPIC -O3"
+    -O3 \
+    -fPIC \
+    -DBOOST_ASIO_HAS_STD_STRING_VIEW=1"
   local ld_flags=" \
     $target_flags \
-    -Wl,-O1,--sort-common,--as-needed,-z,relro,-pie \
-    $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so"
+    $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
+    -nostdlib++"
 
   cd ${_pkgname}_${_boostver}
 
@@ -123,12 +120,13 @@ build() {
     address-model=$_boost_address_model \
     -sICONV_PATH="/opt/android-libs/$_android_arch" \
     cflags="$common_flags" \
-    cxxflags="$common_flags -fexceptions -frtti -std=c++14 -stdlib=libc++" \
+    cxxflags="$common_flags -fexceptions -frtti -std=c++14" \
     linkflags="$ld_flags" \
     --layout=system \
     ${jobs} \
     \
     --prefix="${_stagedir}" \
+    -d+2 \
     install
 }
 
diff --git a/cppunit/android-amd64v8a/PKGBUILD b/cppunit/android-arm64-v8a/PKGBUILD
similarity index 95%
rename from cppunit/android-amd64v8a/PKGBUILD
rename to cppunit/android-arm64-v8a/PKGBUILD
index b3cf480e..171dd57a 100644
--- a/cppunit/android-amd64v8a/PKGBUILD
+++ b/cppunit/android-arm64-v8a/PKGBUILD
@@ -45,16 +45,13 @@ build() {
     -funwind-tables \
     -no-canonical-prefixes \
     -D__ANDROID_API__=$_android_api_level \
-    -D_FORTIFY_SOURCE=2 \
-    -pipe \
-    -fstack-protector-strong \
-    --param=ssp-buffer-size=4 \
-    -fPIE -fPIC -O3 \
+     -O3 \
+    -fPIC \
     -DCPPUNIT_HAVE_LIBDL=1 \
     -Wno-unused-command-line-argument"
   local ld_flags=" \
-    -Wl,-O1,--sort-common,--as-needed,-z,relro,-pie \
-    $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so"
+    $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
+    -nostdlib++"
 
   export AR=${_android_gcc_tool_prefix}-ar
   export AS=${_android_gcc_tool_prefix}-as