external/libxml2/libxml2-android.patch

   1 --- misc/libxml2-2.7.6/ltmain.sh
   2 +++ misc/build/libxml2-2.7.6/ltmain.sh
   3 @@ -3228,6 +3228,12 @@
   4           func_warning "\`-release' is ignored for convenience libraries"
   5        else
   6
   7 +       # Force no versioning suffix for Android thanks to silly
   8 +       # apkbuilder which doesn't add extra native libs unless their
   9 +       # name ends with .so
  10 +
  11 +       version_type=none
  12 +
  13         # Parse the version information argument.
  14         save_ifs="$IFS"; IFS=':'
  15         set dummy $vinfo 0 0 0
  16 --- misc/libxml2-2.7.6/trionan.c
  17 +++ misc/build/libxml2-2.7.6/trionan.c
  18 @@ -327,7 +327,7 @@
  19
  20    if (result == 0.0) {
  21
  22 -#if defined(TRIO_COMPILER_SUPPORTS_C99)
  23 +#if defined(TRIO_COMPILER_SUPPORTS_C99) && !(defined(__ANDROID__) && defined(__clang__))
  24      result = nan("");
  25
  26  #elif defined(NAN) && defined(__STDC_IEC_559__)
  27
  28 --- misc/libxml2-2.7.6/Makefile.in
  29 +++ misc/build/libxml2-2.7.6/Makefile.in
  30 @@ -1635,7 +1635,7 @@
  31  check-am: all-am
  32  check: $(BUILT_SOURCES)
  33         $(MAKE) $(AM_MAKEFLAGS) check-recursive
  34 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
  35 +all-am: Makefile $(LTLIBRARIES) \
  36                 config.h
  37  install-binPROGRAMS: install-libLTLIBRARIES
  38