summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-02-24 14:51:13 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-02-27 13:22:32 +0700
commitcb29b4e3eb334fca6a5b3b7d826f0440c57fb4f0 (patch)
treec256aa564ea72be3471a623aa703b3069b40159b
parent7d9c6708261396236504b6396d4eb4e0b4307d75 (diff)
downloadslackbuilds-cb29b4e3eb334fca6a5b3b7d826f0440c57fb4f0.tar.gz
system/memtest86+: Downgraded to 4.20
Revert "system/memtest86+: Updated for version 5.01." This reverts commit 57dc20a14290de96af02e919c52eafcb8e100d3d.
-rw-r--r--system/memtest86+/README5
-rw-r--r--system/memtest86+/memtest86+.SlackBuild8
-rw-r--r--system/memtest86+/memtest86+.info8
-rw-r--r--system/memtest86+/patches/asm-inline-fix.diff11
4 files changed, 25 insertions, 7 deletions
diff --git a/system/memtest86+/README b/system/memtest86+/README
index 4742f53381..5b65048319 100644
--- a/system/memtest86+/README
+++ b/system/memtest86+/README
@@ -2,4 +2,9 @@ Memtest86+ is thorough, stand alone memory test for Intel/AMD x86
architecture systems. BIOS based memory tests are only a quick check
and often miss failures that are detected by Memtest86+.
+Compilation may fail on 64-bit Slackware due to missing
+/usr/include/gnu/stubs-32.h from glibc. If you experience this problem,
+copy that file from stubs-64.h in the same directory (or create a symlink),
+and you may delete your copy/symlink after you have created the package.
+
See README.SLACKWARE for setup information.
diff --git a/system/memtest86+/memtest86+.SlackBuild b/system/memtest86+/memtest86+.SlackBuild
index fdd15a5a32..21c1961bbe 100644
--- a/system/memtest86+/memtest86+.SlackBuild
+++ b/system/memtest86+/memtest86+.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=memtest86+
-VERSION=${VERSION:-5.01}
+VERSION=${VERSION:-4.20}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -50,9 +50,11 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sed -i "s|scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus||" Makefile
+# Fix false positives in test #7
+# https://bugzilla.novell.com/show_bug.cgi?id=773569
+patch -p1 < $CWD/patches/asm-inline-fix.diff
make CC="gcc -fgnu89-inline"
install -D -m 0644 memtest.bin $PKG/boot/memtest86+.bin
diff --git a/system/memtest86+/memtest86+.info b/system/memtest86+/memtest86+.info
index a0c4aaa564..0a86642385 100644
--- a/system/memtest86+/memtest86+.info
+++ b/system/memtest86+/memtest86+.info
@@ -1,9 +1,9 @@
PRGNAM="memtest86+"
-VERSION="5.01"
+VERSION="4.20"
HOMEPAGE="http://www.memtest.org/"
-DOWNLOAD="http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz"
-MD5SUM="43c5832baa919e1206e251e735cdee2d"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD="http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz"
+MD5SUM="ef62c2f5be616676c8c62066dedc46b3"
+DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Kyle Guinn"
diff --git a/system/memtest86+/patches/asm-inline-fix.diff b/system/memtest86+/patches/asm-inline-fix.diff
new file mode 100644
index 0000000000..049c17af86
--- /dev/null
+++ b/system/memtest86+/patches/asm-inline-fix.diff
@@ -0,0 +1,11 @@
+--- memtest86+-4.20/test.c.orig 2011-01-23 19:11:04.000000000 +0100
++++ memtest86+-4.20/test.c 2012-10-05 14:57:19.000000000 +0200
+@@ -313,7 +313,7 @@ void movinvr()
+ "jb L200\n\t"
+ : "=D" (p)
+ : "D" (p), "b" (pe)
+- : "eax", "edx"
++ : "eax", "ecx", "edx"
+ );
+
+ do_tick();