summaryrefslogtreecommitdiff
path: root/src/stage3/patches
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2018-05-28 16:44:56 +0200
committerAndreas Grapentin <andreas@grapentin.org>2018-05-28 16:44:56 +0200
commitea5bd0fadb112ac1aadb213c59e5ed422cddd7d8 (patch)
tree9db1a9afb2034acc917030b9d6562ccf9aaad77b /src/stage3/patches
parent40252273711f6b4c48f4ffb0c5d39cca95b2ae57 (diff)
... retry
Diffstat (limited to 'src/stage3/patches')
-rw-r--r--src/stage3/patches/generic/binutils.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/stage3/patches/generic/binutils.patch b/src/stage3/patches/generic/binutils.patch
index adfad3a..893089d 100644
--- a/src/stage3/patches/generic/binutils.patch
+++ b/src/stage3/patches/generic/binutils.patch
@@ -1,6 +1,6 @@
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-05-26 08:42:40.899690467 +0200
-+++ b/PKGBUILD 2018-05-28 16:32:59.548362875 +0200
+--- a/PKGBUILD 2018-05-28 16:39:38.041700185 +0200
++++ b/PKGBUILD 2018-05-28 16:44:11.358369579 +0200
@@ -20,13 +20,15 @@ options=(staticlibs !distcc !ccache)
source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig}
0001-PR22741-objcopy-segfault-on-fuzzed-COFF-object.patch
@@ -19,11 +19,12 @@ diff -rupN a/PKGBUILD b/PKGBUILD
prepare() {
mkdir -p binutils-build
-@@ -45,6 +47,8 @@ prepare() {
+@@ -43,8 +45,7 @@ prepare() {
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=22829
+ patch -p1 -i "$srcdir/0002-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch"
- # https://sourceware.org/bugzilla/show_bug.cgi?id=22836
- patch -p1 -i "$srcdir/0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch"
-+
+- # https://sourceware.org/bugzilla/show_bug.cgi?id=22836
+- patch -p1 -i "$srcdir/0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch"
+ patch -p1 -i "$srcdir/binutils-2.30-branch.patch"
}