aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-02-03 21:18:21 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-02-05 08:30:38 +0100
commite478ad1e5da84240f5a8dea01e6be56a9c8dca99 (patch)
tree748eec372b01ee80751529bf6ed3d6739f4cf247
parente2c03d54bb11a405255e8a2a0bbb22a7ac80d512 (diff)
downloadbuildroot-e478ad1e5da84240f5a8dea01e6be56a9c8dca99.tar.gz
buildroot-e478ad1e5da84240f5a8dea01e6be56a9c8dca99.tar.bz2
gcc: or1k: use 20170218 tag instead of branch
As pointed out by Joel Stanley: https://patchwork.ozlabs.org/patch/863011/ Github now longer provides the exact same tarball for the or1k musl-5.4.0 tarball, breaking the build. Even more, musl-5.4.0 is the name of a git branch, not a tag. Fix both problems by changing to the or1k-musl-5.4.0-20170218 tag, which points to the exact same git commit. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Tested-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/gcc/Config.in.host2
-rw-r--r--package/gcc/gcc.hash2
-rw-r--r--package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch (renamed from package/gcc/musl-5.4.0/100-uclibc-conf.patch)0
-rw-r--r--package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch (renamed from package/gcc/musl-5.4.0/301-missing-execinfo_h.patch)0
-rw-r--r--package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch (renamed from package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch)0
-rw-r--r--package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch (renamed from package/gcc/musl-5.4.0/860-cilk-wchar.patch)0
-rw-r--r--package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch (renamed from package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch)0
7 files changed, 2 insertions, 2 deletions
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 8432515d73..309ddf572a 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -81,7 +81,7 @@ config BR2_GCC_VERSION
default "6.4.0" if BR2_GCC_VERSION_6_X
default "7.3.0" if BR2_GCC_VERSION_7_X
default "arc-2017.09-release" if BR2_GCC_VERSION_ARC
- default "musl-5.4.0" if BR2_GCC_VERSION_OR1K
+ default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
config BR2_EXTRA_GCC_CONFIG_OPTIONS
string "Additional gcc options"
diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
index 4966b18f59..fd38cfaad1 100644
--- a/package/gcc/gcc.hash
+++ b/package/gcc/gcc.hash
@@ -10,4 +10,4 @@ sha512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19
# Locally calculated (fetched from Github)
sha512 c30addd3c4dc66b90749a0f99b257c8a8e7966d27f286057b6b66f4a70ca22a1ee50d92882c4db13307d769a6fb28e1e2a2bab749a692cf3f89ef0c38f145efa gcc-arc-2017.09-release.tar.gz
# Locally calculated (fetched from Github)
-sha512 841101f7de45f327bf2e92f3efc73ca88a021e4b9b541458ce80a16e55882bd8606a8492d75c57c589ee2c10d42ae2865b67690155d7289a541df1d68096402f gcc-musl-5.4.0.tar.gz
+sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz
diff --git a/package/gcc/musl-5.4.0/100-uclibc-conf.patch b/package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch
index 73d1f0d3a9..73d1f0d3a9 100644
--- a/package/gcc/musl-5.4.0/100-uclibc-conf.patch
+++ b/package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch
diff --git a/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch b/package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch
index 2d0e7baa44..2d0e7baa44 100644
--- a/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
+++ b/package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch
diff --git a/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch b/package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch
index 9e97d945d3..9e97d945d3 100644
--- a/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch
+++ b/package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch
diff --git a/package/gcc/musl-5.4.0/860-cilk-wchar.patch b/package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch
index 1d9916f554..1d9916f554 100644
--- a/package/gcc/musl-5.4.0/860-cilk-wchar.patch
+++ b/package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch
diff --git a/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch b/package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch
index 07f9a7395b..07f9a7395b 100644
--- a/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch
+++ b/package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch