diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 12:23:20 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:22:10 +0200 |
| commit | 532a5654f433e8b4ae6060b5f4eab6d521a39cce (patch) | |
| tree | 406a14d9031a9760663aedd11bf284c499202d70 /external | |
| parent | 623da78e70f5acf73e689258165bd95ffcea0c72 (diff) | |
Fix Mac OS X install names of external libwpd/libwpg
Change-Id: I25eae3874c7ca4cf4e23673604a1f77e1fa15451
(cherry picked from commit 0329dbd31011db8a8fe4ba806a624916e8c7249b)
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 8 | ||||
| -rw-r--r-- | external/libwpg/ExternalProject_libwpg.mk | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index 8d721b1ea9ba..69c4cc5e8b55 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -30,11 +30,17 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : --without-docs \ --disable-tools \ --disable-debug \ - $(if $(filter MACOSX,$(OS)),--disable-werror) \ + $(if $(filter MACOSX,$(OS)), \ + --disable-werror \ + --prefix=/@.__________________________________________________OOO) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(gb_Package_SOURCEDIR_libwpd)/src/lib/.libs/libwpd-0.10.10.dylib \ + ) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index fab201c3df4a..22ed09aa1de9 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -32,9 +32,14 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : --disable-tools \ --disable-debug \ --disable-werror \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),\ + && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(gb_Package_SOURCEDIR_libwpg)/src/lib/.libs/libwpg-0.3.3.dylib \ + ) \ ) # vim: set noet sw=4 ts=4: |