summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-08 10:36:44 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-08-23 14:46:10 +0200
commitf01281a363a3f2d1c08d224ff39ebc5f5f6c000e (patch)
tree2114ecd2fd09c44ae89a64ee22c2ea20ced1a13f
parent531f3f93146615dd7c77da1d9e5917982bd1f2fe (diff)
Work around GCC 4.8 -Werror=unused-local-typedefs in boost
(cherry picked from commit 6bea5311d70f518444fe3218cf0b6f49bd93cc34) Conflicts: boost/UnpackedTarball_boost.mk Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856
-rw-r--r--boost/UnpackedTarball_boost.mk2
-rw-r--r--boost/boost_1_44_0-gcc4.8.patch24
2 files changed, 26 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 0682306f8b6c..262fbec408d9 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -53,6 +53,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch
# in GCC-4.7 experimental":
boost_patches += boost_1_44_0-gthreads.patch
+boost_patches += boost_1_44_0-gcc4.8.patch
+
boost_patches += boost.ptree.patch
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
new file mode 100644
index 000000000000..9fc603eb14f0
--- /dev/null
+++ b/boost/boost_1_44_0-gcc4.8.patch
@@ -0,0 +1,24 @@
+--- misc/boost_1_44_0/boost/bind/arg.hpp
++++ misc/build/boost_1_44_0/boost/bind/arg.hpp
+@@ -35,6 +35,8 @@
+ {
+ // static assert I == is_placeholder<T>::value
+ typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
++ T_must_be_placeholder dummy; (void) dummy;
++ // silence -Werror=unused-local-typedefs (GCC 4.8)
+ }
+ };
+
+--- misc/boost_1_44_0/boost/concept/detail/general.hpp
++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp
+@@ -68,7 +68,9 @@
+ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
+ typedef ::boost::concepts::detail::instantiate< \
+ &::boost::concepts::requirement_<ModelFnPtr>::failed> \
+- BOOST_PP_CAT(boost_concept_check,__LINE__)
++ BOOST_PP_CAT(boost_concept_check,__LINE__); \
++ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)()
++ // silence -Werror=unused-local-typedefs (GCC 4.8)
+
+ }}
+