forked from amazingfate/loongoffice
935c3ecc89
* In712a31abe4some 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 * Inbfe6af2eedmain() 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 * Sincef070acc564android 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> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186640 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
34 lines
1.3 KiB
Plaintext
34 lines
1.3 KiB
Plaintext
Find bundled ICU in workdir and use debug .libs when needed
|
|
|
|
diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
|
|
--- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200
|
|
+++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200
|
|
@@ -42,6 +42,7 @@
|
|
CC = cl.exe
|
|
CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME)
|
|
CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
|
|
+CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common
|
|
!if "$(WITH_THREADS)" == "ctls"
|
|
CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)"
|
|
!endif
|
|
@@ -51,6 +52,7 @@
|
|
# The linker and its options.
|
|
LD = link.exe
|
|
LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
|
|
+LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib
|
|
LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
|
|
LIBS =
|
|
!if "$(WITH_HTTP)" == "1"
|
|
@@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
|
|
!if "$(STATIC)" == "1"
|
|
LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
|
|
!else
|
|
+!if "$(DEBUG)" == "1"
|
|
+LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
|
|
+!else
|
|
LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
|
|
+!endif
|
|
!endif
|
|
!endif
|
|
!if "$(WITH_ZLIB)" == "1"
|