X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c5421c5824dc2c4f3abfbad046c89043f75201cb..508fa73cb8ff2a01a37c7082905c991937549e24:/packages/libandroid-support/build.sh

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 576ee4dd..a9f44078 100755
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -1,42 +1,26 @@
 TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
 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=${TERMUX_NDK_VERSION}.10
 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} src/musl-locale/
-		cp $NDK/sources/android/support/include/* include/
-		cp $NDK/sources/android/support/src/musl-locale/libc.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
+	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 () {
-	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
+	_C_FILES="src/musl-*/*.c"
 	# Link against libm to avoid linkers having to do it
         $CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS -lm \
                 -Iinclude -Isrc/locale \
@@ -46,11 +30,11 @@ termux_step_make_install () {
 
         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)
 }