X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/8f7dda8321bf7dd6ee58185c6bfd9cee4d57c987..12f6ac00e0c35ade8bf9b9a958180661e64289b8:/packages/libandroid-support/build.sh?ds=sidebyside

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 79712374..30ab92cf 100755
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -1,7 +1,7 @@
 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}
+TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}.4
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
 
@@ -10,9 +10,12 @@ termux_step_post_extract_package () {
 	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/ include/
+		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:
@@ -23,7 +26,8 @@ termux_step_post_extract_package () {
 			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/musl-locale/wcsxfrm_l.c \
+			src/locale/uselocale.c
 	fi
 }