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 /libxmlsec | |
| 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 'libxmlsec')
| -rw-r--r-- | libxmlsec/ExternalProject_xmlsec.mk | 2 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-vc.patch | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index ed9decc0dfc5..f603954ad9ac 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,xmlsec)) $(eval $(call gb_ExternalProject_use_unpacked,xmlsec,xmlsec)) +$(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2)) + $(eval $(call gb_ExternalProject_register_targets,xmlsec,\ build \ )) diff --git a/libxmlsec/xmlsec1-vc.patch b/libxmlsec/xmlsec1-vc.patch index 3f3d00ec30f2..7cd8c4f2d00b 100644 --- a/libxmlsec/xmlsec1-vc.patch +++ b/libxmlsec/xmlsec1-vc.patch @@ -19,7 +19,7 @@ CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H" CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H" CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H" -+CFLAGS = $(CFLAGS) $(SOLARINC) ++CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include # Optimisation and debug symbols. !if "$(DEBUG)" == "1" |