Try to fix sparc64 -mcpu=c3 breakage. Reported upstream.

3 files changed, 35 insertions, 1 deletions

diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index dc13ab24ff4..c6db925f0f7 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2015/04/19 12:18:44 wiz Exp $
+$NetBSD: distinfo,v 1.80 2015/04/25 19:02:06 tnn Exp $
 
 SHA1 (boost_1_58_0.tar.bz2) = 2fc96c1651ac6fe9859b678b165bd78dc211e881
 RMD160 (boost_1_58_0.tar.bz2) = efc78b2b1a5d33ed72fcfa6688564c2fcd56772a
@@ -23,3 +23,5 @@ SHA1 (patch-libs_context_build_Jamfile.v2) = befc2ae62e893ac665e88405d6aca79712f
 SHA1 (patch-libs_context_src_asm_make__ppc32__sysv__macho__gas.S) = 7f598bc270fcfa8babd99e1180248f04b50c2e46
 SHA1 (patch-libs_filesystem_src_unique_path.cpp) = 4693ea11cf464d82168cecaa143b48affa94563b
 SHA1 (patch-libs_log_src_timestamp.cpp) = b6bb7a29467c64f81dafd06039ab3a1842844845
+SHA1 (patch-tools_build_src_tools_gcc.jam) = b0a7ea7b64561ddb68b0dbf6d0276037273b2239
+SHA1 (patch-tools_build_src_tools_gcc.py) = 9e1c6663b060a4cbc3933998ba99bc3dd1fa4a98
diff --git a/meta-pkgs/boost/patches/patch-tools_build_src_tools_gcc.jam b/meta-pkgs/boost/patches/patch-tools_build_src_tools_gcc.jam
new file mode 100644
index 00000000000..0255397063b
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-tools_build_src_tools_gcc.jam
@@ -0,0 +1,16 @@
+$NetBSD: patch-tools_build_src_tools_gcc.jam,v 1.1 2015/04/25 19:02:06 tnn Exp $
+
+https://github.com/boostorg/build/issues/72
+
+--- tools/build/src/tools/gcc.jam.orig	2015-04-04 17:25:07.000000000 +0000
++++ tools/build/src/tools/gcc.jam
+@@ -1138,8 +1138,7 @@ cpu-flags gcc OPTIONS : x86 : c3-2 : -ma
+ ##
+ cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
+ # Sparc
+-cpu-flags gcc OPTIONS : sparc : c3 : -mcpu=c3 : default ;
+-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 ;
++cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
+ cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
+ cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
+ cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
diff --git a/meta-pkgs/boost/patches/patch-tools_build_src_tools_gcc.py b/meta-pkgs/boost/patches/patch-tools_build_src_tools_gcc.py
new file mode 100644
index 00000000000..c3eee897fe9
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-tools_build_src_tools_gcc.py
@@ -0,0 +1,16 @@
+$NetBSD: patch-tools_build_src_tools_gcc.py,v 1.1 2015/04/25 19:02:06 tnn Exp $
+
+https://github.com/boostorg/build/issues/72
+
+--- tools/build/src/tools/gcc.py.orig	2015-04-04 17:25:07.000000000 +0000
++++ tools/build/src/tools/gcc.py
+@@ -789,8 +789,7 @@ cpu_flags('gcc', 'OPTIONS', 'x86', 'atom
+ # Sparc
+ flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'c3', ['-mcpu=c3'], default=True)
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'])
++cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
+ cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
+ cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
+ cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])