Kaydet (Commit) 670f78ee authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix Mac OS X install names of external libwpd/libwpg

Change-Id: I25eae3874c7ca4cf4e23673604a1f77e1fa15451
(cherry picked from commit 0329dbd3)
üst 15c04e1f
...@@ -30,11 +30,17 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : ...@@ -30,11 +30,17 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
--without-docs \ --without-docs \
--disable-tools \ --disable-tools \
--disable-debug \ --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 $(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 $(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)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \ && $(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: # vim: set noet sw=4 ts=4:
...@@ -32,9 +32,14 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : ...@@ -32,9 +32,14 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
--disable-tools \ --disable-tools \
--disable-debug \ --disable-debug \
--disable-werror \ --disable-werror \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \ && $(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: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment