Fix buildflags for android-boost and android-cppunit

This commit is contained in:
Martchus 2018-10-18 21:45:38 +02:00
parent ca5b760b2d
commit ea9a3d045f
2 changed files with 11 additions and 16 deletions

View File

@ -51,16 +51,13 @@ build() {
-funwind-tables \ -funwind-tables \
-no-canonical-prefixes \ -no-canonical-prefixes \
-D__ANDROID_API__=$_android_api_level \ -D__ANDROID_API__=$_android_api_level \
-DBOOST_ASIO_HAS_STD_STRING_VIEW=1 \ -O3 \
-D_FORTIFY_SOURCE=2 \ -fPIC \
-pipe \ -DBOOST_ASIO_HAS_STD_STRING_VIEW=1"
-fstack-protector-strong \
--param=ssp-buffer-size=4 \
-fPIE -fPIC -O3"
local ld_flags=" \ local ld_flags=" \
$target_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} cd ${_pkgname}_${_boostver}
@ -123,12 +120,13 @@ build() {
address-model=$_boost_address_model \ address-model=$_boost_address_model \
-sICONV_PATH="/opt/android-libs/$_android_arch" \ -sICONV_PATH="/opt/android-libs/$_android_arch" \
cflags="$common_flags" \ cflags="$common_flags" \
cxxflags="$common_flags -fexceptions -frtti -std=c++14 -stdlib=libc++" \ cxxflags="$common_flags -fexceptions -frtti -std=c++14" \
linkflags="$ld_flags" \ linkflags="$ld_flags" \
--layout=system \ --layout=system \
${jobs} \ ${jobs} \
\ \
--prefix="${_stagedir}" \ --prefix="${_stagedir}" \
-d+2 \
install install
} }

View File

@ -45,16 +45,13 @@ build() {
-funwind-tables \ -funwind-tables \
-no-canonical-prefixes \ -no-canonical-prefixes \
-D__ANDROID_API__=$_android_api_level \ -D__ANDROID_API__=$_android_api_level \
-D_FORTIFY_SOURCE=2 \ -O3 \
-pipe \ -fPIC \
-fstack-protector-strong \
--param=ssp-buffer-size=4 \
-fPIE -fPIC -O3 \
-DCPPUNIT_HAVE_LIBDL=1 \ -DCPPUNIT_HAVE_LIBDL=1 \
-Wno-unused-command-line-argument" -Wno-unused-command-line-argument"
local ld_flags=" \ 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 AR=${_android_gcc_tool_prefix}-ar
export AS=${_android_gcc_tool_prefix}-as export AS=${_android_gcc_tool_prefix}-as