From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 5 Mar 2017 10:42:26 +0000 (+0100)
Subject: Remove <sys/shm.h> from the NDK
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/f39b87c29432a2c537e4b1fb6a0336a646c942a7?ds=sidebyside

Remove <sys/shm.h> from the NDK

Use the one from libandroid-shmem instead
---

diff --git a/build-package.sh b/build-package.sh
index bcdc5944..613d3fe8 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -564,6 +564,9 @@ termux_step_setup_toolchain() {
 		# ifaddrs.h: Added in android-24 unified headers, use a inline implementation for now.
 		cp "$TERMUX_SCRIPTDIR"/ndk_patches/{elf.h,sysexits.h,ifaddrs.h} $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include
 
+		# Remove <sys/shm.h> from the NDK in favour of that from the libandroid-shmem:
+		rm $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/sys/shm.h
+
 		local _LIBDIR=usr/lib
 		if [ $TERMUX_ARCH = x86_64 ]; then _LIBDIR+=64; fi
 		$TERMUX_ELF_CLEANER $_LIBDIR/*.so