external/liborcus/ExternalProject_liborcus.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 994bb22c8f34786c1d4b0a787f85c16f117aba96
Author: David Tardon <dtar...@redhat.com>
Date: Sat Jun 20 19:09:53 2015 +0200
force liborcus to use internal boost if needed
... in a different way. Because my patch to boost.m4 has been rejected.
Change-Id: I524eee367d5e295f8177e1f50dfdf1d0893ca0c6
diff --git a/external/liborcus/ExternalProject_liborcus.mk
b/external/liborcus/ExternalProject_liborcus.mk
index 1869428..37af7c8 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -103,10 +103,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build)
:
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
$(if $(SYSTEM_BOOST),,\
--with-boost=$(WORKDIR)/UnpackedTarball/boost \
- BOOST_IOSTREAMS_LDFLAGS=' ' \
- BOOST_IOSTREAMS_LIBS=' ' \
- BOOST_SYSTEM_LDFLAGS=' ' \
- BOOST_SYSTEM_LIBS=' ' \
+ boost_cv_lib_iostreams=yes \
+ boost_cv_lib_system=yes \
) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
&& $(if $(VERBOSE)$(verbose),V=1) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
