strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Work around GCC 4.8 -Werror=unused-local-typedefs in boost

Browse source 
Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856
This commit is contained in:
Stephan Bergmann 2013-03-08 10:36:44 +01:00
parent d4c13acaab
commit 6bea5311d7
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boost/UnpackedTarball_boost.mk
View file

@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch
# in GCC-4.7 experimental": # in GCC-4.7 experimental":
boost_patches += boost_1_44_0-gthreads.patch boost_patches += boost_1_44_0-gthreads.patch
boost_patches += boost_1_44_0-gcc4.8.patch
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
$(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))

24
boost/boost_1_44_0-gcc4.8.patch Normal file
View file

@ -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)
}}