X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c8b6264e23c7deb2c66d56f593f39555b0d3e392..0c1ada1f2595825d3fbdfa015a5312b67c94ff20:/packages/libandroid-support/build.sh

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 30ab92cf..992dfb2b 100755
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -1,42 +1,22 @@
 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}.5
 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
+	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/
 }
 
 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 \