[Libreoffice-commits] core.git: 2 commits - boost/boost.6139.clang.patch boost/UnpackedTarball_boost.mk solenv/gbuild

[Peter Foley]

 boost/UnpackedTarball_boost.mk |    2 ++
 boost/boost.6139.clang.patch   |   10 ++++++++++
 solenv/gbuild/LinkTarget.mk    |    4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 6daa038869b5be528811fea7708ad6d7690538bb
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Apr 2 20:29:35 2013 -0400

    supress -Wunused-macros warnings from flex and bison
    
    The c files generated by flex and bison contain many
    usused macros. Supress these warnings.
    
    Change-Id: I95c4297eb964d4d7ffa16f41dc0e7d76d4d1e48b

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5be9d6e..01269d7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1010,7 +1010,7 @@ endef
 # gb_LinkTarget_add_grammar(<component>,<grammar file>)
 define gb_LinkTarget_add_grammar
 $(call gb_YaccTarget_YaccTarget,$(2))
-$(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2),$(3))
+$(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2),$(3),$(if $(filter GCC,$(COM)),-Wno-unused-macros))
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccTarget_get_clean_target,$(2))
 $(call gb_LinkTarget_get_headers_target,$(1)) : $(call gb_YaccTarget_get_header_target,$(2))
 $(call gb_LinkTarget__add_include,$(1),$(dir $(call gb_YaccTarget_get_header_target,$(2))))
@@ -1027,7 +1027,7 @@ endef
 # gb_LinkTarget_add_scanner(<component>,<scanner file>)
 define gb_LinkTarget_add_scanner
 $(call gb_LexTarget_LexTarget,$(2))
-$(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3))
+$(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3),$(if $(filter GCC,$(COM)),-Wno-unused-macros))
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_LexTarget_get_clean_target,$(2))
 
 endef
commit 73be49e5e8cea42bc1531e5374d61cbf8ae5dbbf
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Apr 2 19:34:18 2013 -0400

    fix clang mismatched-tags warning in boost
    
    Change-Id: I6a575b08f46d22fbba25f0fb92f4ef6074803069

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 482bbfa..e997266 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -28,6 +28,8 @@ boost_patches += boost.mipsbackport.patch
 boost_patches += boost.7551.unusedvars.patch
 boost_patches += boost.4100.warnings.patch
 boost_patches += boost.4510.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/6139
+boost_patches += boost.6139.clang.patch
 #https://svn.boost.org/trac/boost/ticket/6940
 boost_patches += boost.6940.glibc.patch
 #https://svn.boost.org/trac/boost/ticket/7774
diff --git a/boost/boost.6139.clang.patch b/boost/boost.6139.clang.patch
new file mode 100644
index 0000000..afa9a25
--- /dev/null
+++ b/boost/boost.6139.clang.patch
@@ -0,0 +1,10 @@
+--- misc/build/boost/boost/detail/container_fwd.hpp	2013-04-02 19:13:58.744000000 -0400
++++ misc/build/boost/boost/detail/container_fwd.hpp	2013-04-02 19:23:13.504000000 -0400
+@@ -17,6 +17,7 @@
+     || ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) \
+         && (defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL))) \
+     || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
++    || __GLIBCXX__ >= 20070513 \
+     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
+     || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
+