diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-02-05 17:19:11 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-02-07 22:33:16 +0000 |
| commit | b9d6c7a48cbe3573a2010811d8671d3e5ff30e2a (patch) | |
| tree | b08989fd5eeb63691f914e8b393d80151588c0f7 /libxslt | |
| parent | 7e2f34a3172a756a0fd70cae1294250206945a6e (diff) | |
convert libxml2 to gbuild and add to tail_build
Change-Id: Ie6ae2150e1f011e17034abcace18c5967b4dacf5
Reviewed-on: https://gerrit.libreoffice.org/2023
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/ExternalProject_xslt.mk | 2 | ||||
| -rw-r--r-- | libxslt/libxslt-vc10.patch | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk index 42bf57a58140..b6aac212c8d0 100644 --- a/libxslt/ExternalProject_xslt.mk +++ b/libxslt/ExternalProject_xslt.mk @@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,xslt)) $(eval $(call gb_ExternalProject_use_unpacked,xslt,xslt)) +$(eval $(call gb_ExternalProject_use_external,xslt,libxml2)) + $(eval $(call gb_ExternalProject_register_targets,xslt,\ build \ )) diff --git a/libxslt/libxslt-vc10.patch b/libxslt/libxslt-vc10.patch index d9479f7fb5b5..b50f0abe2e80 100644 --- a/libxslt/libxslt-vc10.patch +++ b/libxslt/libxslt-vc10.patch @@ -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) $(SOLARINC) ++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include # The linker and its options. LD = link.exe |