redland/ExternalProject_rasqal.mk | 3 +++
redland/ExternalProject_redland.mk | 8 +++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 8acb805b7dd27f389954a6c5e615f0ff662f4e8f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jan 31 12:01:13 2013 +0100
redland depends on both raptor and rasqal
Change-Id: I5b7a2780527c24cba668266ff228f1e6af1d523e
diff --git a/redland/ExternalProject_redland.mk
b/redland/ExternalProject_redland.mk
index af38c5f..a96eccf 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -11,7 +11,10 @@ $(eval $(call gb_ExternalProject_ExternalProject,redland))
$(eval $(call gb_ExternalProject_use_unpacked,redland,redland))
-$(eval $(call gb_ExternalProject_use_package,redland,rasqal))
+$(eval $(call gb_ExternalProject_use_packages,redland, \
+ raptor \
+ rasqal \
+))
$(eval $(call gb_ExternalProject_register_targets,redland,\
build \
commit 7b4d76772ef76a8de852ed647ed0cad368f70189
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jan 31 11:49:26 2013 +0100
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
diff --git a/redland/ExternalProject_rasqal.mk
b/redland/ExternalProject_rasqal.mk
index 0dfcb14..f19e199 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 86fe869..af38c5f 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
