Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/core/binutils/PKGBUILD
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-06-06 20:24:20 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-06-06 20:24:20 +0200
commiteb7cc51023fd1cd1600e066792f1102f267d918f (patch)
tree4a344c0c55c4ab53081b762f1f96f10d259d2da7 /core/binutils/PKGBUILD
parentc64d4389df9ae21d8f4aec814f197079d4c9fdb6 (diff)
core/binutils: redone glibc segfault patch (avoiding collision with 0004 gold patch from upstream)
Diffstat (limited to 'core/binutils/PKGBUILD')
-rw-r--r--core/binutils/PKGBUILD10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index abd0a995..a3f00f0f 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -11,15 +11,17 @@ eval "$(
# this patch was done by diffing the branch against the tag and removing
# some conflicts, also 0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch
# needs disabling because it has already been cherry-picked into the branch.
-# cherry-picking onlt the fix for P23194 leads to assertion violations in
+# cherry-picking onlt the fiy for P23194 leads to assertion violations in
# the GOT, so this was not done.
-source+=(binutils-2.30-branch.patch)
-md5sums+=('a5ba9fc9de327b2eff071e19429c6e67')
+# also conflicted with parts of the gold ld patch 0004-PR22868, eliminated
+# conflicts by picking only the necessary things..
+source+=(binutils-2.30-glibc-segfault.patch)
+md5sums+=('e384a80d85b645c41d05eaae1a81dc03')
eval "$(
declare -f prepare | \
sed '
s/.*0003-PR22836/#\0/
- /0003-PR22836/a patch -p1 -i ${srcdir}/binutils-2.30-branch.patch
+ /0004-PR22868/a patch -p1 -i ${srcdir}/binutils-2.30-glibc-segfault.patch
'
)"