external/libwpd/ExternalProject_libwpd.mk | 8 +++++++-
external/libwpg/ExternalProject_libwpg.mk | 5 +++++
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 670f78ee3c89434d965970f6220eff811bc8b7ab
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jun 8 12:23:20 2015 +0200
Fix Mac OS X install names of external libwpd/libwpg
Change-Id: I25eae3874c7ca4cf4e23673604a1f77e1fa15451
(cherry picked from commit 0329dbd31011db8a8fe4ba806a624916e8c7249b)
diff --git a/external/libwpd/ExternalProject_libwpd.mk
b/external/libwpd/ExternalProject_libwpd.mk
index 8d721b1..69c4cc5 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 fab201c..22ed09a 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
