diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-03 14:41:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-03 14:47:31 +0200 |
| commit | 66c028fa4c5c3a7c9756c61130d0506e01b58d23 (patch) | |
| tree | 5c6c56865dd34fdb8547cc47e5ba26c44800e76c /redland | |
| parent | 6848b33c9fdcc67e842627e1da588031a63b88ee (diff) | |
redland: clean up libxml2 usage
- use xml2-config from unpacked dir
- rasqal does use libxml2 apparently for utils
- redland itself does not use libxml2 directly
- no need to put OUTDIR/bin on PATH
Change-Id: Ib4481c681d0b188c06217f7bc0d000f15ab82da3
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/ExternalProject_raptor.mk | 3 | ||||
| -rw-r--r-- | redland/ExternalProject_rasqal.mk | 3 | ||||
| -rw-r--r-- | redland/ExternalProject_redland.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index f5fc5dfaf048..b35578d43790 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -29,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): --without-xslt-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \ lt_cv_cc_dll_switch="-shared" \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ ) else @@ -48,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ - $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ ) endif diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index b82e4c134c9b..10ff5f3ef5f1 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -37,13 +37,13 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): --with-digest-library=internal \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ lt_cv_cc_dll_switch="-shared" \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ ) else $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_run,build,\ CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ - PATH="$(OUTDIR)/bin:$$PATH" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \ @@ -60,6 +60,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index e75d11f92d33..530295aed83e 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -11,8 +11,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,redland)) $(eval $(call gb_ExternalProject_use_unpacked,redland,redland)) -$(eval $(call gb_ExternalProject_use_external,redland,libxml2)) - $(eval $(call gb_ExternalProject_use_packages,redland, \ raptor \ rasqal \ |