summaryrefslogtreecommitdiff
path: root/src/stage2/patches/generic/binutils.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/stage2/patches/generic/binutils.patch')
-rw-r--r--src/stage2/patches/generic/binutils.patch35
1 files changed, 4 insertions, 31 deletions
diff --git a/src/stage2/patches/generic/binutils.patch b/src/stage2/patches/generic/binutils.patch
index 6f0895c..b7b6710 100644
--- a/src/stage2/patches/generic/binutils.patch
+++ b/src/stage2/patches/generic/binutils.patch
@@ -1,34 +1,7 @@
diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD 2018-05-28 16:39:38.041700185 +0200
-+++ b/PKGBUILD 2018-05-28 16:42:42.595035360 +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
- 0002-PR22829-objcopy-strip-removes-PT_GNU_RELRO-from-lld-.patch
-- 0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch)
-+ 0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch
-+ https://raw.githubusercontent.com/archlinux32/packages/master/core/binutils/binutils-2.30-branch.patch)
- validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
- md5sums=('ffc476dd46c96f932875d1b2e27e929f'
- 'SKIP'
- '469164f3c93a0e92a697537b60c9806c'
- '0c679b37e90fb23de60a4d28329b956a'
-- '53b5682e09c0a27e9994c3efdfe01d29')
-+ '53b5682e09c0a27e9994c3efdfe01d29'
-+ 'a5ba9fc9de327b2eff071e19429c6e67')
-
- prepare() {
- mkdir -p binutils-build
-@@ -43,14 +45,14 @@ 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"
-+ patch -p1 -i "$srcdir/binutils-2.30-branch.patch"
- }
-
- build() {
+--- a/PKGBUILD 2018-06-20 07:56:40.877881835 +0200
++++ b/PKGBUILD 2018-06-20 11:07:26.331329370 +0200
+@@ -51,6 +51,7 @@ build() {
cd binutils-build
"$srcdir/binutils-$pkgver/configure" \
@@ -36,7 +9,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
--prefix=/usr \
--with-lib-path=/usr/lib:/usr/local/lib \
--with-bugurl=https://bugs.archlinux.org/ \
-@@ -66,7 +68,7 @@ build() {
+@@ -66,7 +67,7 @@ build() {
--disable-gdb \
--disable-werror \
--with-pic \