summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-05-06 13:57:00 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-05-06 14:00:21 (GMT)
commitebf9125fb758c9b0fb74277e8babb5c4669534d6 (patch)
treee65a1bd22f4854820206bfa60e1517142c366894
parent18ec40bade8ca1f73c5da919e2810f0d7f0e4f22 (diff)
downloaddefinitions-ebf9125fb758c9b0fb74277e8babb5c4669534d6.tar.gz
Revert "Upgrade to GCC 5.1"
This reverts commit acb29d344d117133891199ea536d9c4d34c7d05e. We have discovered that Baserock systems built with GCC 5.1 cannot *deploy* working disk images. The images hang in SYSLINUX. We suspect that it is a bug in SYSLINUX that is triggered by the compiler upgrade, and upgrading SYSLINUX may well fix this issue, but we don't have time to do this and test it in time for a 15.19 release Change-Id: I3c661b14fb923eee37c4c0148904620362fe62e2
-rw-r--r--strata/armv7lhf-cross-toolchain.morph12
-rw-r--r--strata/build-essential.morph20
-rw-r--r--strata/build-essential/stage2-glibc.morph1
-rw-r--r--strata/build-essential/stage2-libstdc++.morph2
4 files changed, 17 insertions, 18 deletions
diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 591fa58..ffc4a9d 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -19,8 +19,8 @@ chunks:
- name: armv7lhf-cross-gcc-nolibc
morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
repo: upstream:gcc-tarball
- ref: cca9d546d497fac90f862e52c61177ba1daa9a84
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- armv7lhf-cross-binutils
@@ -37,8 +37,8 @@ chunks:
- name: armv7lhf-cross-gcc
morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
repo: upstream:gcc-tarball
- ref: cca9d546d497fac90f862e52c61177ba1daa9a84
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- armv7lhf-cross-binutils
- armv7lhf-cross-glibc
@@ -46,8 +46,8 @@ chunks:
- name: armv7lhf-cross-libstdc++
morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph
repo: upstream:gcc-tarball
- ref: cca9d546d497fac90f862e52c61177ba1daa9a84
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- armv7lhf-cross-binutils
- armv7lhf-cross-gcc
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 3cb87fa..4eb5fdb 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -59,8 +59,8 @@ chunks:
- name: stage1-gcc
morph: strata/build-essential/stage1-gcc.morph
repo: upstream:gcc-tarball
- ref: cca9d546d497fac90f862e52c61177ba1daa9a84
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
build-mode: bootstrap
@@ -92,8 +92,8 @@ chunks:
- name: stage2-libstdc++
morph: strata/build-essential/stage2-libstdc++.morph
repo: upstream:gcc-tarball
- ref: cca9d546d497fac90f862e52c61177ba1daa9a84
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
- stage1-gcc
@@ -118,8 +118,8 @@ chunks:
- name: stage2-gcc-fixed-headers
morph: strata/build-essential/stage2-gcc-fixed-headers.morph
repo: upstream:gcc-tarball
- ref: cca9d546d497fac90f862e52c61177ba1daa9a84
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
- stage1-gcc
@@ -131,8 +131,8 @@ chunks:
- name: stage2-gcc
morph: strata/build-essential/stage2-gcc.morph
repo: upstream:gcc-tarball
- ref: cca9d546d497fac90f862e52c61177ba1daa9a84
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
- stage1-gcc
@@ -356,8 +356,8 @@ chunks:
- name: gcc
morph: strata/build-essential/gcc.morph
repo: upstream:gcc-tarball
- ref: 7b410925ecc2c60653378a7ff26ce64f4095858c
- unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc+docs_fix
+ ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index c480c87..9e5e745 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -21,7 +21,6 @@ configure-commands:
$ARCH_FLAGS \
--build=$(../scripts/config.guess) --host=$TARGET_STAGE1 \
--prefix="$PREFIX" \
- --enable-obsolete-rpc \
`# [1]` --libdir="$PREFIX/lib" \
`# [2]` --with-headers="$(pwd)/../../$PREFIX/include" \
`# [3]` --disable-profile --enable-kernel=2.6.25 \
diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph
index f9f245c..3d89ad8 100644
--- a/strata/build-essential/stage2-libstdc++.morph
+++ b/strata/build-essential/stage2-libstdc++.morph
@@ -27,7 +27,7 @@ configure-commands:
--disable-multilib \
`# [1]` --disable-libstdcxx-threads \
`# [2]` --disable-libstdcxx-pch \
- `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/5.1.0
+ `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/4.9.2
build-commands:
- cd o && make