emacs: ac_cv_func_setrlimit=no to make termux-am work within emacs (#2239)

[termux-packages] / packages / ndk-multilib / build.sh

diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh
index 19b782f..dad5eaf 100644 (file)
--- a/packages/ndk-multilib/build.sh
+++ b/packages/ndk-multilib/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
-TERMUX_SUBPKG_DESCRIPTION="multilib binaries for cross-compilation"
+TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
@@ -16,12 +17,17 @@ prepare_libs () {
 
        mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib
        local BASEDIR=$NDK/platforms/android-${TERMUX_PKG_API_LEVEL}/arch-$ARCH/usr/lib
-       if [ $ARCH = x86_64 ] || [ $ARCH = mips64 ]; then BASEDIR+="64"; fi
+       if [ $ARCH = x86_64 ]; then BASEDIR+="64"; fi
        cp $BASEDIR/*.o $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib
 
        LIBATOMIC=$NDK/toolchains/${NDK_SUFFIX}-*/prebuilt/linux-*/${SUFFIX}/lib
        if [ $ARCH = arm64 ]; then LIBATOMIC+="64"; fi
-       cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/libatomic.a
+       if [ $ARCH = "arm" ]; then LIBATOMIC+="/armv7-a"; fi
+       cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/
+
+       LIBGCC=$NDK/toolchains/${NDK_SUFFIX}-*/prebuilt/linux-*/lib/gcc/${SUFFIX}/4.9.x
+       if [ $ARCH = "arm" ]; then LIBGCC+="/armv7-a"; fi
+       cp $LIBGCC/libgcc.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/
 }
 
 termux_step_extract_into_massagedir () {
@@ -29,6 +35,4 @@ termux_step_extract_into_massagedir () {
        prepare_libs "arm64" "aarch64-linux-android"
        prepare_libs "x86" "i686-linux-android"
        prepare_libs "x86_64" "x86_64-linux-android"
-       prepare_libs "mips" "mipsel-linux-android"
-       prepare_libs "mips64" "mips64el-linux-android"
 }