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

[Michael Stahl]

 external/boost/UnpackedTarball_boost.mk                        |    3 +
 external/boost/boost.system.error_code_header_only_fix.patch.1 |   21 ++++++++++
 external/liborcus/ExternalProject_liborcus.mk                  |    2 
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit fa9ee4c1fd5d2907ae28813a9b41a9dcf1ae9e95
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 8 16:43:16 2015 +0200

    boost: fix boost_system BOOST_ERROR_CODE_HEADER_ONLY breakage
    
    Ugly hack in ExternalProject_liborcus.mk as apparently it fails with the
    define on Windows, and without on MacOSX :(
    
    Change-Id: If0b52825122edd956044f61d413c57a76f485101

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index b0ffa9e..7dac750 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -110,6 +110,9 @@ boost_patches += w4702.patch.0
 boost_patches += ubsan.patch.0
 boost_patches += rtti.patch.0
 
+# 5.0 branch fix
+boost_patches += boost.system.error_code_header_only_fix.patch.1
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost.system.error_code_header_only_fix.patch.1 b/external/boost/boost.system.error_code_header_only_fix.patch.1
new file mode 100644
index 0000000..68d2c1c
--- /dev/null
+++ b/external/boost/boost.system.error_code_header_only_fix.patch.1
@@ -0,0 +1,21 @@
+bundled boost 1.55 error_code.cpp breaks when compiled with BOOST_ERROR_CODE_HEADER_ONLY
+
+--- boost/libs/system/src/error_code.cpp.orig	2015-09-08 16:37:11.595528207 +0200
++++ boost/libs/system/src/error_code.cpp	2015-09-08 16:39:12.696518815 +0200
+@@ -17,6 +17,10 @@
+ #define BOOST_SYSTEM_SOURCE 
+ 
+ #include <boost/system/config.hpp>
++
++#ifndef BOOST_ERROR_CODE_CPP
++#define BOOST_ERROR_CODE_CPP
++
+ #include <boost/system/error_code.hpp>
+ #include <boost/cerrno.hpp>
+ #include <vector>
+@@ -477,3 +480,5 @@
+ 
+   } // namespace system
+ } // namespace boost
++
++#endif // BOOST_ERROR_CODE_CPP
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index ee890cd..e9726c1 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
+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_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)