diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-14 14:54:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 11:03:05 +0200 |
| commit | 84b0f0631574832c5939cc63456fd1322e67339f (patch) | |
| tree | 6f280d08f6eb125b0efb113c509dbadd91684f29 /external/libxslt | |
| parent | consistent naming of externals: png -> libpng (diff) | |
| download | core-84b0f0631574832c5939cc63456fd1322e67339f.tar.gz core-84b0f0631574832c5939cc63456fd1322e67339f.zip | |
consistent naming of externals: xml2 -> libxml2
Change-Id: Ia1164c70d02dce70cb346c1fd4033f12d91c6e5d
Reviewed-on: https://gerrit.libreoffice.org/42297
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/libxslt')
| -rw-r--r-- | external/libxslt/ExternalProject_xslt.mk | 4 | ||||
| -rw-r--r-- | external/libxslt/libxslt-msvc.patch.2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index 02c239b069ee..0dafc9109834 100644 --- a/external/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk @@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): cscript /e:javascript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ vcmanifest=yes \ - lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ + lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ $(if $(filter IOS,$(OS)),LIBS="-liconv") \ --disable-shared,--disable-static) \ - $(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \ + $(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,libxml2)) \ && chmod 777 xslt-config \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ diff --git a/external/libxslt/libxslt-msvc.patch.2 b/external/libxslt/libxslt-msvc.patch.2 index 07e5dce578d8..cc2d2c14f99e 100644 --- a/external/libxslt/libxslt-msvc.patch.2 +++ b/external/libxslt/libxslt-msvc.patch.2 @@ -4,7 +4,7 @@ CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(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\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common ++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 |