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 | |
parent | 37563db622eef1bf13fe78b21507fba033586560 (diff) |
libxml2, libxslt: use libraries from WORKDIR
Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d
Diffstat (limited to 'external')
-rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 7 | ||||
-rw-r--r-- | external/libxml2/ExternalPackage_xml2.mk | 5 | ||||
-rw-r--r-- | external/libxml2/libxml2-configure.patch | 6 | ||||
-rw-r--r-- | external/libxslt/ExternalPackage_xslt.mk | 10 | ||||
-rw-r--r-- | external/libxslt/ExternalProject_xslt.mk | 3 | ||||
-rw-r--r-- | external/libxslt/libxslt-configure.patch | 8 |
6 files changed, 13 insertions, 26 deletions
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 23619ed3b2de..b4f17ced3e13 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -26,9 +26,10 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ - $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ - LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(OUTDIR)/lib -llibxml2","-L$(gb_Helper_OUTDIRLIBDIR) -lxml2"),\ - $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),\ + LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ + LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2"),\ + $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ 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() { diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index 909405e99c28..d91b509aada9 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -17,35 +17,25 @@ endif ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dylib,libxslt/.libs/libxslt.1.dylib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.dylib,libexslt/.libs/libexslt.0.dylib)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) else ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.a,libxslt/.libs/libxslt.a)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.a,libexslt/.libs/libexslt.a)) ifneq ($(CROSS_COMPILING),YES) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/xsltproc)) endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dll.a,libxslt/.libs/libxslt.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,libxslt/.libs/libxslt.dll)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.dll.a,libexslt/.libs/libexslt.dll.a)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,libexslt/.libs/libexslt.dll)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,xsltproc/.libs/xsltproc.exe)) else # COM=MSC -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.lib,win32/bin.msvc/libxslt.lib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.lib,win32/bin.msvc/libexslt.lib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,win32/bin.msvc/libxslt.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,win32/bin.msvc/libexslt.dll)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so,libxslt/.libs/libxslt.so.1.1.26)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15)) -$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so,libexslt/.libs/libexslt.so.0.8.15)) $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) endif diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index fa1377093770..3243fee6b35e 100644 --- a/external/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk @@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): $(call gb_ExternalProject_run,build,\ cscript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) @@ -48,7 +49,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 $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR)) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \ && chmod 777 xslt-config \ && $(MAKE) \ ) diff --git a/external/libxslt/libxslt-configure.patch b/external/libxslt/libxslt-configure.patch index 6b189df5aa0d..37b86cc9c251 100644 --- a/external/libxslt/libxslt-configure.patch +++ b/external/libxslt/libxslt-configure.patch @@ -57,13 +57,13 @@ +#includedir=@includedir@ +#libdir=@libdir@ + -+prefix=${SOLARVERSION}/${INPATH} -+exec_prefix=${SOLARVERSION}/${INPATH} ++prefix=${WORKDIR}/UnpackedTarball/xslt ++exec_prefix=${WORKDIR}/UnpackedTarball/xsltproc exec_prefix_set=no -includedir=@includedir@ -libdir=@libdir@ -+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external -+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} ++includedir=${WORKDIR}/UnpackedTarball/xslt/libxslt ++libdir=${WORKDIR}/UnpackedTarball/xslt/libxslt/.libs usage() { |