aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2022-02-19 03:43:32 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-20 15:12:44 +0700
commit43ef5db833820dd22a2cf7c9cb8dfd70da71665e (patch)
treef7581c17a51d09d7ed82bbafd00d8fcdec6593a9 /system
parentc9687b46580ab257c6a72621f49cf20c4b8c3169 (diff)
system/memtest86+: Patch for newer binutils
Signed-off-by: Kyle Guinn <elyk03@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/memtest86+/memtest86+.SlackBuild7
-rw-r--r--system/memtest86+/patches/discard-note_gnu_property.patch9
2 files changed, 14 insertions, 2 deletions
diff --git a/system/memtest86+/memtest86+.SlackBuild b/system/memtest86+/memtest86+.SlackBuild
index 7dc5a97b9cee7..0e95f2a425c8d 100644
--- a/system/memtest86+/memtest86+.SlackBuild
+++ b/system/memtest86+/memtest86+.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for memtest86+
-# Copyright 2013-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2022 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=memtest86+
VERSION=${VERSION:-5.01}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -93,6 +93,9 @@ patch -p1 < $CWD/patches/memtest86+-test-7-smp.patch
# https://bugs.debian.org/629506
patch -p1 < $CWD/patches/bug_629506_message_15.mbox
+# https://bugzilla.opensuse.org/show_bug.cgi?id=1185272
+patch -p1 < $CWD/patches/discard-note_gnu_property.patch
+
make
install -D -m 0755 memtest $PKG/boot/$PRGNAM-$VERSION
install -D -m 0644 memtest.bin $PKG/boot/$PRGNAM-$VERSION.bin
diff --git a/system/memtest86+/patches/discard-note_gnu_property.patch b/system/memtest86+/patches/discard-note_gnu_property.patch
new file mode 100644
index 0000000000000..7c1179f077588
--- /dev/null
+++ b/system/memtest86+/patches/discard-note_gnu_property.patch
@@ -0,0 +1,9 @@
+--- a/memtest.bin.lds 2020-04-12 17:14:51.000000000 +0200
++++ b/memtest.bin.lds 2021-12-04 14:54:33.178625382 +0100
+@@ -11,5 +11,6 @@
+ *(.data)
+ _end = . ;
+ }
++ /DISCARD/ : { *(.note.gnu.property) }
+ _syssize = (_end - _start + 15) >> 4;
+ }