[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/liborcus

Michael Stahl mstahl at redhat.com
Tue Sep 8 09:53:44 PDT 2015


 external/liborcus/ExternalProject_liborcus.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e00fc3439aa642485e55b8247e80af286f08a84
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 8 18:51:32 2015 +0200

    boost fix, next attempt: just because jenkins Linux can build it...
    
    Change-Id: I7b6910a131d95a74168ccee9140bc58393ceddb0

diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index e9726c1..47fbdfb 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED $(if $(filter MACOSX,$(OS)),-DBOOST_ERROR_CODE_HEADER_ONLY)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED $(if $(filter-out WNT,$(OS)),-DBOOST_ERROR_CODE_HEADER_ONLY)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)


More information about the Libreoffice-commits mailing list