Xisco Fauli
e3b5e3aebc
* In https://gitlab.gnome.org/GNOME/libxml2/-/commit/712a31abe458eed75f0e2a442b35af58cf7091ca some members used by Libreoffice were marked as deprecated. Add deprecated.patch.0 to undeprecate them for now. Meanwhile https://gitlab.gnome.org/GNOME/libxml2/-/issues/936#note_2461334 has been opened to discuss it. The necessary code changes will be addressed in a follow-up commit * In https://gitlab.gnome.org/GNOME/libxml2/-/commit/bfe6af2eed38564693b35ac5aa60178068f34fbb main() was moved from xmllint.c to lintmain.c. Add makefile.msvc-entry-point.patch.0 to address that * 0001-parser-Fix-custom-SAX-parsers-without-cdataBlock-han.patch.1 fixes https://gitlab.gnome.org/GNOME/libxml2/-/issues/934 * Since https://gitlab.gnome.org/GNOME/libxml2/-/commit/f070acc56400410a3ad27f4df313526749364962 android builds in Jenkins fail with "configure: error: libiconv not found" Run configure with --without-iconv. Same as in Windows * Adapt testLeadingTabHTML since The HTML parser normalizes newlines according to HTML5 now See https://gitlab.gnome.org/GNOME/libxml2/-/issues/938#note_2463720 Downloaded from https://download.gnome.org/sources/libxml2/2.14/libxml2-2.14.3.tar.xz Change-Id: Ie010c236f5dad5156f7f4204033d0c02928742ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184501 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
13 lines
459 B
Diff
13 lines
459 B
Diff
Add SOLARINC, and disable SSE2 default for MSVC2012
|
|
|
|
--- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200
|
|
+++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200
|
|
@@ -46,6 +46,7 @@
|
|
CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)"
|
|
!endif
|
|
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
|
|
+CFLAGS = $(CFLAGS) $(SOLARINC)
|
|
|
|
# The linker and its options.
|
|
LD = link.exe
|