diff options
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 2 | ||||
| -rw-r--r-- | external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1 | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 8e9d6242d245..732b5645f059 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -93,6 +93,8 @@ boost_patches += boost_1_59_0.multi_array.wshadow.patch boost_patches += boost_1_59_0.signal2.wshadow.patch # https://svn.boost.org/trac/boost/ticket/11501 boost_patches += boost_1_59_0.property_tree.wreturn-type.patch +# fixed upstream by bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4 +boost_patches += boost.concept_check.Wunused-local-typedefs.warnings.patch.1 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) diff --git a/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1 b/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1 new file mode 100644 index 000000000000..c85fc7e26143 --- /dev/null +++ b/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1 @@ -0,0 +1,13 @@ +Fixed differently upstream by commit bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4 + +--- boost/boost/concept/detail/general.hpp.orig 2015-07-31 14:03:08.184447736 +0200 ++++ boost/boost/concept/detail/general.hpp 2015-07-31 14:03:10.048447591 +0200 +@@ -67,7 +67,7 @@ + + // Version check from https://svn.boost.org/trac/boost/changeset/82886 + // (boost/static_assert.hpp) +-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) ++#if defined(__GNUC__) && (((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) || defined(__clang__)) + #define BOOST_CONCEPT_UNUSED_TYPEDEF __attribute__((unused)) + #else + #define BOOST_CONCEPT_UNUSED_TYPEDEF /**/ |