liborcus/ExternalProject_liborcus.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 5f668959c5645bb8f5dbe6dbf77cf3da6fdb01a5
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 26 17:30:36 2013 +0100
make liborcus build on platforms that need PTHREAD_LIBS
Change-Id: Ied274511193eba9373072f1bc0636fe7f8a52b02
diff --git a/liborcus/ExternalProject_liborcus.mk
b/liborcus/ExternalProject_liborcus.mk
index 301141a..93cdcc4 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -64,11 +64,17 @@ endif
endif
liborcus_CXXFLAGS=$(CXXFLAGS)
+liborcus_LDFLAGS=$(LDFLAGS)
ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
endif
ifeq ($(SYSTEM_BOOST),NO)
liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost
+else
+liborcus_LDFLAGS+=$(BOOST_LDFLAGS)
+endif
+ifneq (,$(PTHREAD_LIBS))
+liborcus_LDFLAGS+=$(PTHREAD_LIBS)
endif
$(call gb_ExternalProject_get_state_target,liborcus,build) :
@@ -76,7 +82,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
$(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
$(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS)') \
- $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS='$(BOOST_LDFLAGS)') \
+ $(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \
./configure \
--with-pic \
--enable-static \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
