diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2020-02-04 12:07:17 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-02-04 22:19:13 +0100 |
| commit | 98c7c52e30a921a1bde3e4b2aa8c240d95ed577d (patch) | |
| tree | 95cdfeead46d82d6fe742bb2fb5779762fcb5678 /external/libxslt | |
| parent | tdf#117331 Merge jurt and unoil into ridl (diff) | |
| download | core-98c7c52e30a921a1bde3e4b2aa8c240d95ed577d.tar.gz core-98c7c52e30a921a1bde3e4b2aa8c240d95ed577d.zip | |
Optionally generate PDB for libxslt.dll
Change-Id: I4d6fc685fdbcb7536f5ccb4825094b323820741a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87967
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external/libxslt')
| -rw-r--r-- | external/libxslt/UnpackedTarball_libxslt.mk | 4 | ||||
| -rw-r--r-- | external/libxslt/libxslt-msvc-sym.patch.2 | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/external/libxslt/UnpackedTarball_libxslt.mk b/external/libxslt/UnpackedTarball_libxslt.mk index b035e99f0a79..5bde97637e25 100644 --- a/external/libxslt/UnpackedTarball_libxslt.mk +++ b/external/libxslt/UnpackedTarball_libxslt.mk @@ -16,7 +16,9 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libxslt)) $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\ external/libxslt/libxslt-config.patch.1 \ external/libxslt/libxslt-internal-symbols.patch.1 \ - external/libxslt/libxslt-msvc.patch.2 \ + $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED),\ + external/libxslt/libxslt-msvc-sym.patch.2, \ + external/libxslt/libxslt-msvc.patch.2) \ external/libxslt/libxslt-1.1.26-memdump.patch \ external/libxslt/rpath.patch.0 \ external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 \ diff --git a/external/libxslt/libxslt-msvc-sym.patch.2 b/external/libxslt/libxslt-msvc-sym.patch.2 new file mode 100644 index 000000000000..34bf1d0c9d1e --- /dev/null +++ b/external/libxslt/libxslt-msvc-sym.patch.2 @@ -0,0 +1,16 @@ +--- build/libxslt-1.1.26/win32/Makefile.msvc.old 2019-10-20 01:02:55.359375000 +0200 ++++ build/libxslt-1.1.26/win32/Makefile.msvc 2019-10-20 01:03:05.187500000 +0200 +@@ -54,11 +54,13 @@ + CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D "_REENTRANT" + CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) + CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE ++CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common + + # The linker and its options. + LD = link.exe + LDFLAGS = /nologo + LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) ++LDFLAGS = $(LDFLAGS) /DEBUG + LIBS = + + # The archiver and its options. |