X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c8b6264e23c7deb2c66d56f593f39555b0d3e392..295241d4043c55a41259b4846464e1668b2f6a5f:/packages/ndk-stl/build.sh

diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 33220ace..a3a90992 100644
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -1,17 +1,12 @@
 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_DEPENDS="libgnustl"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
 termux_step_extract_into_massagedir () {
-        #mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/gcc/arm-linux-androideabi/4.9.0/include/
-        #cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.8/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/gcc/arm-linux-androideabi/4.9.0/include/
-	# Needed:
-        #cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/gcc/arm-linux-androideabi/4.9.0/include/arm-linux-androideabi/bits/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/gcc/arm-linux-androideabi/4.9.0/include/bits/
-        
         mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
-        cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
+	cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
+
 	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