diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-31 11:49:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-31 12:11:32 +0100 |
| commit | 7b4d76772ef76a8de852ed647ed0cad368f70189 (patch) | |
| tree | 78e705a8517ad3677519d36fa58f11e14a4877a5 /redland | |
| parent | dc173b7f2a550185404aacbc6da744cb6d1880fc (diff) | |
Call macosx-change-install-names on "external" libs, too
...at least on those that link against other "external" libs, as otherwise they
will have broken dependencies on those
/@.__________________________________________________OOO/lib/... files that did
not get rewritten by macosx-change-install-names. In the old build system,
solenv/inc/tg_ext.mk took care of this.
Change-Id: I5ffeed7d2a19170371db9093d29f3df9a1eb54c8
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/ExternalProject_rasqal.mk | 3 | ||||
| -rw-r--r-- | redland/ExternalProject_redland.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 0dfcb14f32c1..f19e19953da9 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -51,6 +51,9 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),&& $(PERL) \ + $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ + $(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.1.dylib) \ && touch $@ endif # vim: set noet sw=4 ts=4: diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 86fe869ffa06..af38c5ff30fe 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -56,6 +56,9 @@ $(call gb_ExternalProject_get_state_target,redland,build): $(if $(filter-out ANDROID,$(OS)),--with-threads) \ && cd librdf \ && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),&& $(PERL) \ + $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ + $(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.0.dylib) \ && touch $@ endif # vim: set noet sw=4 ts=4: |