libandroid-support: Add back strfmon.c

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 14babef..1d196e2 100755 (executable)
--- 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}.6
+TERMUX_PKG_VERSION=${TERMUX_NDK_VERSION}.7
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
 
@@ -10,7 +10,7 @@ termux_step_post_extract_package () {
        mkdir -p src/musl-locale/ src/musl-multibyte/ include/
        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} 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/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/
 }

diff --git a/packages/libandroid-support/langinfo.h.patch b/packages/libandroid-support/langinfo.h.patch
index 415d3ff..91b60f7 100644 (file)
--- a/packages/libandroid-support/langinfo.h.patch
+++ b/packages/libandroid-support/langinfo.h.patch
@@ -1,13 +1,16 @@
 Include <xlocale.h> from langinfo.h so that locale_t gets defined.
 
+Include <locale.h> from langinfo.h so that LC_ALL gets defined.
+
 diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/langinfo.h ./include/langinfo.h
 --- /home/fornwall/lib/android-ndk/sources/android/support/include/langinfo.h  2016-03-03 16:54:04.000000000 -0500
 +++ ./include/langinfo.h       2016-03-12 17:23:01.187197445 -0500
-@@ -31,6 +31,7 @@
+@@ -31,6 +31,8 @@
  // __LP64__
  
  #include <nl_types.h>
 +#include <xlocale.h>
++#include <locale.h>
  
  #define _NL_ITEM(category,index)  (((category) << 10) | (index))