X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/3f300a10fc7d4d34642f80368bb02f2898f7fb8a..507b334733254805ae62222134e7e3beb7f8d287:/packages/ndk-stl/build.sh

diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index a3a90992..5b5dcd02 100644
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -1,21 +1,17 @@
 TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 TERMUX_PKG_DESCRIPTION="Header files from the Android NDK needed for compiling C++ programs using STL"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
 termux_step_extract_into_massagedir () {
-        mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
-	cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
+	cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
 
-	if [ $TERMUX_ARCH = arm ]; then
-		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/arm-linux-androideabi/armv7-a/bits/* \
-		   $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
-	else
-		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/$TERMUX_ARCH-linux-android/bits/* \
-		   $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
-	fi
-        # fenv.h is a C++ compatibility header which should be included with the compiler
-        rm -Rf $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/{arm-linux-androideabi,tr1,tr2,fenv.h,complex.h}
+	# Revert the patch for <cstddef> that's only used for using g++
+	# from the ndk (https://github.com/android-ndk/ndk/issues/215):
+	cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
+	sed "s%\@TERMUX_HOST_PLATFORM\@%${TERMUX_HOST_PLATFORM}%g" $TERMUX_SCRIPTDIR/ndk-patches/cstddef.cpppatch | patch -p1 -R
 }
 
 termux_step_massage () {