diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 18:02:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:30:20 +0200 |
| commit | c03ff5ebc0f008825e45285f7c4021329bd60c05 (patch) | |
| tree | f47d34d1d7f5f351a273d70b68ce8923aa0eedb1 /external/libxml2 | |
| parent | 37563db622eef1bf13fe78b21507fba033586560 (diff) | |
libxml2, libxslt: use libraries from WORKDIR
Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d
Diffstat (limited to 'external/libxml2')
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2.mk | 5 | ||||
| -rw-r--r-- | external/libxml2/libxml2-configure.patch | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index cbd06b2837e1..a89e4a505d73 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -17,26 +17,21 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.dylib,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.dylib,.libs/libxml2.2.dylib)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) else ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.a,.libs/libxml2.a)) ifneq ($(CROSS_COMPILING),YES) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.dll.a,.libs/libxml2.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,.libs/libxml2.dll,xml2)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,.libs/xmllint.exe)) else # COM=MSC -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.lib,win32/bin.msvc/libxml2.lib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,win32/bin.msvc/libxml2.dll,xml2)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,win32/bin.msvc/xmllint.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.so,.libs/libxml2.so.2.7.6)) $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) endif diff --git a/external/libxml2/libxml2-configure.patch b/external/libxml2/libxml2-configure.patch index d8515016df5c..731308ed95a5 100644 --- a/external/libxml2/libxml2-configure.patch +++ b/external/libxml2/libxml2-configure.patch @@ -97,10 +97,10 @@ +#includedir=@includedir@ +#libdir=@libdir@ + -+prefix=${SOLARVERSION}/${INPATH} -+exec_prefix=${SOLARVERSION}/${INPATH} ++prefix=${WORKDIR}/UnpackedTarball/xml2 ++exec_prefix=${WORKDIR}/UnpackedTarball/xml2 +includedir=${WORKDIR}/UnpackedTarball/xml2/include -+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} ++libdir=${WORKDIR}/UnpackedTarball/xml2/.libs usage() { |