summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-06-02 16:32:39 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-06-06 14:52:48 +0000
commit917ee4cf0f8e49c911207f8f4626a14104f7f6ba (patch)
treed898804cc83451fbef62bec9d7dcc3d712a5d2c0
parent40a3bd822e74408ae5ce3a10dbe595878c7c8583 (diff)
downloaddefinitions-917ee4cf0f8e49c911207f8f4626a14104f7f6ba.tar.gz
Upgrade to glibc-2.23, also disable-werror for gcc6
'disable-werror' won't be needed when upgrading to a newer glibc Change-Id: I7d60784f03d0c8af24bd19bb27e04bc2800f555a
-rw-r--r--strata/build-essential.morph12
-rw-r--r--strata/build-essential/glibc.morph3
-rw-r--r--strata/build-essential/stage2-glibc.morph1
3 files changed, 9 insertions, 7 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 6ec7443e..c1b09172 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -80,8 +80,8 @@ chunks:
- name: stage2-glibc
morph: strata/build-essential/stage2-glibc.morph
repo: upstream:glibc
- ref: b995d95a5943785be3ab862b2d3276f3b4a22481
- unpetrify-ref: release/2.22/master
+ ref: ab30899d880f9741a409cbc0d7a28399bdac21bf
+ unpetrify-ref: glibc-2.23
build-depends:
- stage1-binutils
- stage1-gcc
@@ -201,8 +201,8 @@ chunks:
- name: stage2-reset-specs
morph: strata/build-essential/stage2-reset-specs.morph
repo: upstream:glibc
- ref: 4e42b5b8f89f0e288e68be7ad70f9525aebc2cff
- unpetrify-ref: glibc-2.21
+ ref: ab30899d880f9741a409cbc0d7a28399bdac21bf
+ unpetrify-ref: glibc-2.23
build-depends:
- stage1-binutils
- stage1-gcc
@@ -246,8 +246,8 @@ chunks:
- name: glibc
morph: strata/build-essential/glibc.morph
repo: upstream:glibc
- ref: b995d95a5943785be3ab862b2d3276f3b4a22481
- unpetrify-ref: release/2.22/master
+ ref: ab30899d880f9741a409cbc0d7a28399bdac21bf
+ unpetrify-ref: glibc-2.23
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
index 6c87c5d9..46a30167 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.morph
@@ -63,7 +63,8 @@ configure-commands:
--enable-kernel=3.0.0 \
--without-cvs \
--without-selinux \
- --enable-obsolete-rpc
+ --enable-obsolete-rpc \
+ --disable-werror
build-commands:
- cd o && make localtime=UTC
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index ffe19120..8b8dd47d 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -22,6 +22,7 @@ configure-commands:
--build=$(../scripts/config.guess) --host=$TARGET_STAGE1 \
--prefix="$PREFIX" \
--enable-obsolete-rpc \
+ --disable-werror \
`# [1]` --libdir="$PREFIX/lib" \
`# [2]` --with-headers="$(pwd)/../../$PREFIX/include" \
`# [3]` --disable-profile --enable-kernel=2.6.25 \