From 3fadb15754eeaa76b3c711ea60e73f638e05ec48 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Thu, 24 Apr 2014 13:31:38 +0000
Subject: Partially upgrade Baserock to use GCC 4.7

The bootstrap still uses GCC 4.6 at this point. To use 4.7, we must
change the bootstrap to give GCC a sysroot path at configure time, which
has various consequences.

A bug in GCC 4.6.2 prevents GCC 4.7 from building it, so we must also apply
the patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51969 to GCC 4.6.
---
 armv7lhf-cross-toolchain.morph |  6 ++----
 build-essential.morph          | 12 ++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/armv7lhf-cross-toolchain.morph b/armv7lhf-cross-toolchain.morph
index 8d21fa6c..692f14f2 100644
--- a/armv7lhf-cross-toolchain.morph
+++ b/armv7lhf-cross-toolchain.morph
@@ -16,8 +16,7 @@ chunks:
   build-depends: []
 - name: armv7lhf-cross-gcc-nolibc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
-  unpetrify-ref: baserock/build-essential
+  ref: baserock/sam/gcc-4.6-fixed-for-4.7
   build-depends:
   - armv7lhf-cross-binutils
 - name: armv7lhf-cross-eglibc
@@ -30,8 +29,7 @@ chunks:
   - armv7lhf-cross-linux-api-headers
 - name: armv7lhf-cross-gcc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
-  unpetrify-ref: baserock/build-essential
+  ref: baserock/sam/gcc-4.7
   build-depends:
   - armv7lhf-cross-binutils
   - armv7lhf-cross-eglibc
diff --git a/build-essential.morph b/build-essential.morph
index 628fffcb..e1d70046 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -46,8 +46,7 @@ chunks:
   prefix: /tools
 - name: stage1-gcc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
-  unpetrify-ref: baserock/build-essential
+  ref: baserock/sam/gcc-4.6-fixed-for-4.7
   build-depends:
   - stage1-binutils
   build-mode: bootstrap
@@ -83,8 +82,7 @@ chunks:
   prefix: /tools
 - name: stage2-gcc-fixed-headers
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
-  unpetrify-ref: baserock/build-essential
+  ref: baserock/sam/gcc-4.6-fixed-for-4.7
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -93,8 +91,7 @@ chunks:
   prefix: /tools
 - name: stage2-gcc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
-  unpetrify-ref: baserock/build-essential
+  ref: baserock/sam/gcc-4.6-fixed-for-4.7
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -276,8 +273,7 @@ chunks:
   prefix: /usr
 - name: gcc
   repo: upstream:gcc-tarball
-  ref: 088b7ab28fe53b198ec5c4eaba0f54176c4c35a0
-  unpetrify-ref: baserock/build-essential
+  ref: baserock/sam/gcc-4.7
   build-depends:
   - stage2-binutils
   - stage2-busybox
-- 
cgit v1.2.1


From 8e21ab8724ffbba60db470471dca7e9af77e1acf Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Fri, 25 Apr 2014 08:00:58 +0000
Subject: Branch distcc to disable -Werror so that it compiles with GCC 4.7.3

---
 tools.morph | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools.morph b/tools.morph
index 80908497..ed0985a6 100644
--- a/tools.morph
+++ b/tools.morph
@@ -51,8 +51,7 @@ chunks:
   build-depends: []
 - name: distcc
   repo: upstream:distcc
-  ref: 2f422c03925e82bf88b05da823813073a985b0e5
-  unpetrify-ref: baserock/morph
+  ref: baserock/sam/gcc-4.7
   build-depends: []
 - name: e2fsprogs
   repo: upstream:e2fsprogs
-- 
cgit v1.2.1