X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9fa59b1c259c3602abd78ef12c18596e75557ce3..295241d4043c55a41259b4846464e1668b2f6a5f:/packages/libgnustl/build.sh

diff --git a/packages/libgnustl/build.sh b/packages/libgnustl/build.sh
index fdd0d9b3..64e5de8e 100644
--- a/packages/libgnustl/build.sh
+++ b/packages/libgnustl/build.sh
@@ -1,22 +1,19 @@
 TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/onlinedocs/libstdc++/
 TERMUX_PKG_DESCRIPTION="The GNU Standard C++ Library (a.k.a. libstdc++-v3), necessary on android since the system libstdc++.so is stripped down"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-TERMUX_PKG_BUILD_REVISION=4
-
-termux_step_make_install () {
-        local LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/libgnustl_shared.so
-	if [ $TERMUX_ARCH = arm ]; then
-		LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/libgnustl_shared.so
-	fi
-
-	cp $LIBFILE $TERMUX_PREFIX/lib/
-}
+TERMUX_PKG_REVISION=1
+# Since every C++ package links against this by default (due
+# to the libstdc++.so -> libgnustl_shared.so setup in
+# build-package.sh) this package is considered essential,
+# and other packages does not need to declare explicit
+# dependency on it.
+TERMUX_PKG_ESSENTIAL=yes
 
 termux_step_post_massage () {
-	# Setup a libgnustl_shared.so in $PREFIX/lib, so that other C++ using packages
-	# links to it. We do however want to avoid installing this, to avoid problems
-	# where e.g. libm.so on some i686 devices links against libstdc++.so, so do
-	# this here in termux_step_post_massage.
-	cd $TERMUX_PREFIX/lib
-	ln -f -s libgnustl_shared.so libstdc++.so
+	# We take the library here after massage step to
+	# avoid stripping the library after running termux-elf-cleaner,
+	# which causes a broken library (program compiled on the
+	# device linking to the library will segfault, at least on aarch64).
+	mkdir lib
+	cp $TERMUX_PREFIX/lib/libgnustl_shared.so lib/
 }