summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-09-24 23:02:54 +0000
committertnn <tnn@pkgsrc.org>2015-09-24 23:02:54 +0000
commit2f34e8bcc349911a87c0a3d2bdfe0295dd00cb57 (patch)
tree1d997b6837b6b9b49070397622b6ec1b2c7262ab
parent6bf8f2a2a25edd4cda81a3869b070aae892f01f3 (diff)
downloadpkgsrc-2f34e8bcc349911a87c0a3d2bdfe0295dd00cb57.tar.gz
work around a configure test that makes GCC 5.2 choke
-rw-r--r--meta-pkgs/boost/distinfo3
-rw-r--r--meta-pkgs/boost/patches/patch-libs_config_test_boost__no__range__based__for.ipp22
2 files changed, 24 insertions, 1 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 4898d0ed4e9..96d16002342 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2015/08/14 07:54:04 adam Exp $
+$NetBSD: distinfo,v 1.83 2015/09/24 23:02:54 tnn Exp $
SHA1 (boost_1_59_0.tar.bz2) = b94de47108b2cdb0f931833a7a9834c2dd3ca46e
RMD160 (boost_1_59_0.tar.bz2) = a106b3cd1dbda2323e5e84c7106cedee327db03c
@@ -19,6 +19,7 @@ SHA1 (patch-boost_core_noncopyable.hpp) = a693e5eda7fc303e1bd86ecfab40321d771af6
SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff
SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12
SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711
+SHA1 (patch-libs_config_test_boost__no__range__based__for.ipp) = d9936c472fc2c696d86522b36eb12813ae91bee4
SHA1 (patch-libs_context_build_Jamfile.v2) = befc2ae62e893ac665e88405d6aca79712f2549b
SHA1 (patch-libs_context_src_asm_make__ppc32__sysv__macho__gas.S) = 7f598bc270fcfa8babd99e1180248f04b50c2e46
SHA1 (patch-libs_filesystem_src_unique_path.cpp) = 4693ea11cf464d82168cecaa143b48affa94563b
diff --git a/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__range__based__for.ipp b/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__range__based__for.ipp
new file mode 100644
index 00000000000..c468f0eab6b
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__range__based__for.ipp
@@ -0,0 +1,22 @@
+$NetBSD: patch-libs_config_test_boost__no__range__based__for.ipp,v 1.1 2015/09/24 23:02:54 tnn Exp $
+
+This configure test goes into an infinite loop with GCC 5.2.0 at
+optimization level -O2 when -std=c++11 is not selected.
+-O0 makes it segfault instead which is more appropriate as it counts
+as a test failure, but is still horribly broken.
+The expected result for trying to compile with c++11 features when
+c++11 is not enabled should arguably be a compile error.
+
+--- libs/config/test/boost_no_range_based_for.ipp.orig 2015-08-04 11:44:49.000000000 +0000
++++ libs/config/test/boost_no_range_based_for.ipp
+@@ -9,6 +9,10 @@
+ // TITLE: C++11 ranged-based for statement unavailable
+ // DESCRIPTION: The compiler does not support the C++11 range-based for statement
+
++#if defined(__GNUC__) && __GNUC__ == 5
++#pragma GCC optimize ("O0")
++#endif
++
+ namespace boost_no_cxx11_range_based_for {
+
+ int test()