Remove <spawn.h> completely

Fixes building fish.

diff --git a/build-package.sh b/build-package.sh
index 161f306..aa0726b 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -364,7 +364,7 @@ termux_step_start_build() {
        TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${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"
@@ -671,7 +671,8 @@ termux_step_setup_toolchain() {
                # Remove <sys/sem.h> as it doesn't work for non-root.
                # Remove <iconv.h> as we currently provide it from libandroid-support.
                # Remove <glob.h> as we currently provide it from libandroid-glob.
-               rm usr/include/sys/{shm.h,sem.h} usr/include/{iconv.h,glob.h}
+               # Remove <spawn.h> as it's only for future (later than android-27).
+               rm usr/include/sys/{shm.h,sem.h} usr/include/{iconv.h,glob.h,spawn.h}
 
                sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
                        usr/include/android/api-level.h

diff --git a/ndk-patches/spawn.h.patch b/ndk-patches/spawn.h.patch
deleted file mode 100644 (file)
index dcd5fef..0000000
--- a/ndk-patches/spawn.h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/spawn.h ./usr/include/spawn.h
---- /home/fornwall/lib/android-ndk/sysroot/usr/include/spawn.h 2017-11-09 09:57:12.000000000 +0100
-+++ ./usr/include/spawn.h      2017-11-15 12:08:34.911786251 +0100
-@@ -36,6 +36,8 @@
- 
- __BEGIN_DECLS
- 
-+#if __ANDROID_API__ >= __ANDROID_API_FUTURE__
-+
- #define POSIX_SPAWN_RESETIDS 1
- #define POSIX_SPAWN_SETPGROUP 2
- #define POSIX_SPAWN_SETSIGDEF 4
-@@ -51,7 +53,6 @@
- typedef struct __posix_spawn_file_actions* posix_spawn_file_actions_t;
- 
- 
--#if __ANDROID_API__ >= __ANDROID_API_FUTURE__
- int posix_spawn(pid_t* __pid, const char* __path, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN_FUTURE;
- int posix_spawnp(pid_t* __pid, const char* __file, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN_FUTURE;
-