Update from NDK r14 to r15

[termux-packages] / packages / libandroid-support / build.sh

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 30ab92c..3668b2a 100755 (executable)
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -1,56 +1,27 @@
-TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
+TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-support
 TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for additional multibyte, locale and math support"
-# Increase last digit each time a patch changes.
-TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}.4
+TERMUX_PKG_VERSION=15
+TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=73f7543c6005d376edcaf915ac22f53a9f0a2d6c87fe7dde5f890d26c8d49ebc
+TERMUX_PKG_FOLDERNAME=libandroid-support-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
 
-termux_step_post_extract_package () {
-        cd $TERMUX_PKG_SRCDIR
-       if [ "$TERMUX_ARCH_BITS" = "64" ]; then
-               # https://android.googlesource.com/platform/ndk.git/+/7c811775212f8ae0ecdcf60d05fefb1582207038
-               # For 64-bit bionic has almost everything except the following:
-               mkdir -p src/musl-locale/ src/musl-multibyte/ include/
-               cp $NDK/sources/android/support/src/musl-multibyte/mblen.c src/musl-multibyte/
-               cp $NDK/sources/android/support/src/musl-locale/{catclose.c,catgets.c,catopen.c} src/musl-locale/
-               cp $NDK/sources/android/support/src/musl-locale/{langinfo.c,intl.c,iconv.c} src/musl-locale/
-               cp $NDK/sources/android/support/include/* include/
-               cp $NDK/sources/android/support/src/musl-locale/{libc.h,codepages.h,legacychars.h,jis0208.h,gb18030.h,big5.h,hkscs.h,ksc.h} include/
-       else
-               cp -Rf $NDK/sources/android/support/* .
-               # See Android.mk for files not to build:
-               rm      src/musl-stdio/vwscanf.c \
-                       src/musl-stdio/wscanf.c \
-                       src/musl-locale/newlocale.c \
-                       src/musl-locale/nl_langinfo_l.c \
-                       src/musl-locale/strcoll_l.c \
-                       src/musl-locale/strxfrm_l.c \
-                       src/musl-locale/wcscoll_l.c \
-                       src/musl-locale/wcsxfrm_l.c \
-                       src/locale/uselocale.c
-       fi
-}
-
 termux_step_make_install () {
-       if [ "$TERMUX_ARCH_BITS" = "64" ]; then
-               _C_FILES="src/musl-*/*.c"
-       else
-               _C_FILES="src/locale/*.c src/musl-*/*.c src/stdio/*.c src/*.c"
-       fi
-       # Link against libm to avoid linkers having to do it
-        $CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS -lm \
-                -Iinclude -Isrc/locale \
+       _C_FILES="src/musl-*/*.c"
+       $CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS \
+               -Iinclude -Isrc/locale \
                $_C_FILES \
-                -shared -fpic \
-                -o libandroid-support.so
+               -shared -fpic \
+               -o libandroid-support.so
 
-        cp libandroid-support.so $TERMUX_PREFIX/lib/
+       cp libandroid-support.so $TERMUX_PREFIX/lib/
 
-        (cd $TERMUX_PREFIX/lib; rm -f libiconv.so libintl.so; ln -s libandroid-support.so libiconv.so; ln -s libandroid-support.so libintl.so)
+       (cd $TERMUX_PREFIX/lib; ln -f -s libandroid-support.so libiconv.so; ln -f -s libandroid-support.so libintl.so)
 
        rm -Rf $TERMUX_PREFIX/include/libandroid-support
        mkdir -p $TERMUX_PREFIX/include/libandroid-support
        cp -Rf include/* $TERMUX_PREFIX/include/libandroid-support/
 
-        (cd $TERMUX_PREFIX/include; rm -f libintl.h iconv.h; ln -s libandroid-support/libintl.h libintl.h; ln -s libandroid-support/iconv.h iconv.h)
+       (cd $TERMUX_PREFIX/include; ln -f -s libandroid-support/libintl.h libintl.h; ln -f -s libandroid-support/iconv.h iconv.h)
 }