diff options
Diffstat (limited to 'external/libxml2/libxml2-android.patch')
| -rw-r--r-- | external/libxml2/libxml2-android.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/external/libxml2/libxml2-android.patch b/external/libxml2/libxml2-android.patch new file mode 100644 index 000000000000..06d5e57ad31d --- /dev/null +++ b/external/libxml2/libxml2-android.patch @@ -0,0 +1,27 @@ +--- misc/libxml2-2.7.6/ltmain.sh ++++ misc/build/libxml2-2.7.6/ltmain.sh +@@ -3228,6 +3228,12 @@ + func_warning "\`-release' is ignored for convenience libraries" + else + ++ # Force no versioning suffix for Android thanks to silly ++ # apkbuilder which doesn't add extra native libs unless their ++ # name ends with .so ++ ++ version_type=none ++ + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 +--- misc/libxml2-2.7.6/trionan.c ++++ misc/build/libxml2-2.7.6/trionan.c +@@ -327,7 +327,7 @@ + + if (result == 0.0) { + +-#if defined(TRIO_COMPILER_SUPPORTS_C99) ++#if defined(TRIO_COMPILER_SUPPORTS_C99) && !(defined(__ANDROID__) && defined(__clang__)) + result = nan(""); + + #elif defined(NAN) && defined(__STDC_IEC_559__) + |