forked from amazingfate/loongoffice
2b32959918
* drop ubsan.patch.0: presumably fixed upstream * drop 0001-* CVE fixes: fixed upstream Change-Id: I3e2a53b5ef82ef8edd85e812fd5dee67ab60db94 Reviewed-on: https://gerrit.libreoffice.org/41951 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
24 lines
703 B
Diff
24 lines
703 B
Diff
--- 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__)
|
|
|
|
--- misc/libxml2-2.7.6/Makefile.in
|
|
+++ misc/build/libxml2-2.7.6/Makefile.in
|
|
@@ -1635,7 +1635,7 @@
|
|
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
|
|
check: $(BUILT_SOURCES)
|
|
$(MAKE) $(AM_MAKEFLAGS) check-recursive
|
|
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
|
|
+all-am: Makefile $(LTLIBRARIES) \
|
|
config.h
|
|
install-binPROGRAMS: install-libLTLIBRARIES
|
|
|