stunnel: Update from 5.41 to 5.42

[termux-packages] / packages / libgnustl / build.sh

diff --git a/packages/libgnustl/build.sh b/packages/libgnustl/build.sh
index 1014836..435de34 100644 (file)
--- a/packages/libgnustl/build.sh
+++ b/packages/libgnustl/build.sh
@@ -1,16 +1,21 @@
 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
 
-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
+termux_step_extract_into_massagedir() {
+       if [ "$TERMUX_ARCH" = arm ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_shared.so
+       elif [ "$TERMUX_ARCH" = i686 ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_shared.so
+       elif [ "$TERMUX_ARCH" = aarch64 ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_shared.so
+       elif [ "$TERMUX_ARCH" = x86_64 ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_shared.so
+       else
+               termux_error_exit "Unsupported arch"
+       fi
 
-       cp $LIBFILE $TERMUX_PREFIX/lib/
-       cd $TERMUX_PREFIX/lib/
-
-       ln -s -f libgnustl_shared.so libstdc++.so
+       mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib"
+       cp "$_STL_LIBFILE" "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib"
 }