X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/02380b95b32d1b82a6fb31a3b1cab45de4a5026c..10d2dcda8578bae838de5c42d33664b34c29a65c:/packages/libgnustl/build.sh

diff --git a/packages/libgnustl/build.sh b/packages/libgnustl/build.sh
index 10148364..64e5de8e 100644
--- a/packages/libgnustl/build.sh
+++ b/packages/libgnustl/build.sh
@@ -1,16 +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=1
+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_make_install () {
-        LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_ARCH}-linux-android/lib/libgnustl_shared.so
-        if [ $TERMUX_ARCH = arm ]; then
-                LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/arm-linux-androideabi/lib/armv7-a/hard/libgnustl_shared.so
-        fi
-
-	cp $LIBFILE $TERMUX_PREFIX/lib/
-	cd $TERMUX_PREFIX/lib/
-
-	ln -s -f libgnustl_shared.so libstdc++.so
+termux_step_post_massage () {
+	# 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/
 }