From 12f6ac00e0c35ade8bf9b9a958180661e64289b8 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 4 Jan 2016 06:39:40 -0500
Subject: [PATCH] libandroid-support: Add iconv for 64-bit build

---
 packages/libandroid-support/build.sh      |  4 ++--
 packages/libandroid-support/iconv.h.patch | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 packages/libandroid-support/iconv.h.patch

diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh
index 576ee4dd..30ab92cf 100755
--- a/packages/libandroid-support/build.sh
+++ b/packages/libandroid-support/build.sh
@@ -13,9 +13,9 @@ termux_step_post_extract_package () {
 		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/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 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:
diff --git a/packages/libandroid-support/iconv.h.patch b/packages/libandroid-support/iconv.h.patch
new file mode 100644
index 00000000..a709ee38
--- /dev/null
+++ b/packages/libandroid-support/iconv.h.patch
@@ -0,0 +1,19 @@
+diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h ./include/iconv.h
+--- /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h	2014-06-03 13:15:33.000000000 -0400
++++ ./include/iconv.h	2016-01-03 21:17:16.472527767 -0500
+@@ -28,8 +28,6 @@
+ #ifndef NDK_ANDROID_SUPPORT_ICONV_H
+ #define NDK_ANDROID_SUPPORT_ICONV_H
+ 
+-#if !defined(__LP64__)
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -46,6 +44,4 @@
+ }  // extern "C"
+ #endif
+ 
+-#endif // !__LP64__
+-
+ #endif  // NDK_ANDROID_SUPPORT_ICONV_H
-- 
2.11.0