| Tor Lillqvist | 90324cc | 2011-11-10 01:17:25 +0200 | [diff] [blame] | 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 |
| Tor Lillqvist | 6a17d2f | 2013-03-22 22:00:37 +0200 | [diff] [blame] | 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 | |