From 44118b6e67f383d3f4990a80021ce9155311c6e2 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 24 Mar 2019 23:15:10 +0100 Subject: [PATCH] Remove sys/capability.h from the NDK sysroot The sys/capability.h file will be provided by libcap-dev. --- scripts/build/termux_step_setup_toolchain.sh | 3 +++ scripts/build/termux_step_start_build.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index b4106dbf5..cb4b5ba49 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -90,6 +90,9 @@ termux_step_setup_toolchain() { # Remove android-support header wrapping not needed on android-21: rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local + # Remove sys/capability.h provided by libcap-dev: + rm $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/sys/capability.h + if [ "$TERMUX_ARCH" = "aarch64" ]; then # Use gold by default to work around https://github.com/android-ndk/ndk/issues/148 cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \ diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index 442ac3023..0a191e88f 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -5,7 +5,7 @@ termux_step_start_build() { TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}" # Bump the below version if a change is made in toolchain setup to ensure # that everyone gets an updated toolchain: - TERMUX_STANDALONE_TOOLCHAIN+="-v1" + TERMUX_STANDALONE_TOOLCHAIN+="-v2" if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"