[Libreoffice-commits] core.git: redland/ExternalProject_redland.mk

[Stephan Bergmann]

 redland/ExternalProject_redland.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b89d4c7fb1c3dd3a4af42380eb8de92d60a102e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 16 21:29:08 2013 +0200

fdo#58978 Typo

...leading to macosx-change-install-names not doing its work, and librdf
referencing libraptor and librasqal with bogus paths on Mac OS X, and thus
cannot be dlopen'ed.

Change-Id: I187ce9a0ddc453157bf8666df4d385a07a8762f7

diff --git a/redland/ExternalProject_redland.mk 
b/redland/ExternalProject_redland.mk
index 6034534..8e3 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 $(MAKE) \
$(if $(filter MACOSX,$(OS)), $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
-   
$(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.$(RASQAL_MAJOR).dylib) \
+   
$(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \
)
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: redland/ExternalProject_redland.mk

[Michael Stahl]

 redland/ExternalProject_redland.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5020e25c88a3a0ed11222f8b255b35abb5dc4d5a
Author: Michael Stahl mst...@redhat.com
Date:   Wed Apr 3 15:27:42 2013 +0200

redland: stop using --with-threads, it supports only POSIX...

... so it's better to wrap an osl::Mutex around the whole thing in
client code.

Change-Id: I611aa879e03c11c01fbd215148750a11a285b216

diff --git a/redland/ExternalProject_redland.mk 
b/redland/ExternalProject_redland.mk
index 530295a..c35a5bf 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -36,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
RASQAL_LIBS=-L$(OUTDIR)/lib -lrasqal \
./configure --disable-static --disable-gtk-doc \
--disable-modular \
+   --without-threads \
--without-bdb --without-sqlite --without-mysql \
--without-postgresql --without-threestore 
--without-virtuoso \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
@@ -59,12 +60,12 @@ $(call gb_ExternalProject_get_state_target,redland,build):
RASQAL_LIBS=-L$(OUTDIR)/lib -lrasqal \
./configure --disable-gtk-doc \
--disable-modular \
+   --without-threads \
--without-bdb --without-sqlite --without-mysql \
--without-postgresql --without-threestone 
--without-virtuoso \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
-   $(if $(filter-out ANDROID,$(OS)),--with-threads) \
 $(MAKE) \
$(if $(filter MACOSX,$(OS)), $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits