diff options
| author | est31 <MTest31@outlook.com> | 2015-07-29 11:54:27 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-07-29 15:59:06 +0200 |
| commit | eb3aac20c879b9532cd3b678efb2126adcd07af7 (patch) | |
| tree | 93ebffb360dcc45fdd687519cd054926c14cc743 /build/android/libiconv_stdio.patch | |
| parent | f97c2702a2fee9496059169448ce97ed2b7da9b2 (diff) | |
| download | minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.tar.gz minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.tar.bz2 minetest-eb3aac20c879b9532cd3b678efb2126adcd07af7.zip | |
Android: fix horrible libiconv build
Before, our libiconv build was a joke. We first called configure for our own build host system,
then called make, before we executed a Android.mk script we provided as patch. The first "native make"
always failed, and the LIBICONV_LIB file setting in our Makefile didn't match the built one,
resulting in an always-rebuild of iconv.
This commit cleans up this total mess, removes the double-build, and the Android.mk, and properly calls
./configure with the according target platform, and uses a built toolchain.
As we have to deal with the android bug "NDK: Support for prebuild libs with full sonames"
https://code.google.com/p/android/issues/detail?id=55868
as the 2013 patch
https://lists.gnu.org/archive/html/libtool-patches/2013-06/msg00002.html
by Google's David Turner wasn't inside the 2011 libtool, we pass -avoid-version to
libtool.
Thanks to the proper build, wide_to_utf8 works for android now, removing us of the need to disable it.
Diffstat (limited to 'build/android/libiconv_stdio.patch')
| -rw-r--r-- | build/android/libiconv_stdio.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/android/libiconv_stdio.patch b/build/android/libiconv_stdio.patch index 19cb6aa09..9fa50f79a 100644 --- a/build/android/libiconv_stdio.patch +++ b/build/android/libiconv_stdio.patch @@ -1,10 +1,13 @@ --- a/srclib/stdio.in.h 2011-08-07 15:42:06.000000000 +0200 +++ b/srclib/stdio.in.h 2015-06-10 09:27:58.129056262 +0200 -@@ -695,7 +696,8 @@ _GL_CXXALIASWARN (gets); +@@ -695,8 +696,9 @@ _GL_CXXALIASWARN (gets); /* It is very rare that the developer ever has full control of stdin, so any use of gets warrants an unconditional warning. Assume it is always declared, since it is required by C89. */ -_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/ +#define gets(a) fgets( a, sizeof(*(a)), stdin) - #endif
\ No newline at end of file + #endif + + +#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ |