forked from amazingfate/loongoffice
f7197cd244
- from libxml2-configure.patch: * drop config.sub Android stuff (obsolete) * drop Makefile.in disabling targets for Android (hypothetically obsolete) * drop xmlversion.h changes (pointless - configure.js generates it) * split out libxml2-freebsd.patch.1 * split out libxml2-config.patch.1 - drop libxml2-long-path.patch (integrated upstream) - drop libxml2-gnome599717.patch (obsolete) - drop libxml2-xpath.patch (obsolete) - drop libxml2-latin.patch (obsolete) - drop libxml2-aix.patch: presumably don't need special check for V7BETA since it's released now - drop libxml2-mingw.patch: actually appears to patch a MSVC-specific part of the file so is obsolete anyway Change-Id: I87bf8968bd4a554852a2791420a5d0db822beeaa
28 lines
769 B
Diff
28 lines
769 B
Diff
--- 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__)
|
|
|