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
