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 80d6aa0..3668b2a 100755 (executable)
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -1,27 +1,15 @@
-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"
-TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}
+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 () {
-       mkdir -p src/musl-locale/ src/musl-multibyte/ include/ src/musl-ctype/
-       cp $NDK/sources/android/support/src/musl-multibyte/{mblen.c,mbsrtowcs.c,mbsnrtowcs.c,libc.h,internal.h,internal.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,strfmon.c} src/musl-locale/
-       cp $NDK/sources/android/support/src/musl-ctype/* src/musl-ctype/
-
-       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/
-
-       # Use up-to-date (Unicode 9) wcwidth:
-       cp $TERMUX_PKG_BUILDER_DIR/wcwidth.c $NDK/sources/android/support/src/musl-ctype/wcwidth.c
-}
-
 termux_step_make_install () {
        _C_FILES="src/musl-*/*.c"
-       # Link against libm to avoid linkers having to do it
-       $CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS -lm \
+       $CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS \
                -Iinclude -Isrc/locale \
                $_C_FILES \
                -shared -fpic \