[pkgsrc/trunk]: pkgsrc/sysutils/memtestplus memtestplus: revert previous, dis...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d68c1f9aa70
branches:  trunk
changeset: 374794:6d68c1f9aa70
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Jan 29 14:23:26 2018 +0000

description:
memtestplus: revert previous, disable optimization.

Hack to fix PR pkg/52962. Now memtestplus functions correctly for sure.
Inspired by opensuse package.

diffstat:

 sysutils/memtestplus/Makefile             |   4 ++--
 sysutils/memtestplus/distinfo             |   6 +++---
 sysutils/memtestplus/patches/patch-aa     |  10 ++++++++--
 sysutils/memtestplus/patches/patch-main.c |  15 ++-------------
 4 files changed, 15 insertions(+), 20 deletions(-)

diffs (93 lines):

diff -r 666c22c3fb88 -r 6d68c1f9aa70 sysutils/memtestplus/Makefile
--- a/sysutils/memtestplus/Makefile     Mon Jan 29 14:15:57 2018 +0000
+++ b/sysutils/memtestplus/Makefile     Mon Jan 29 14:23:26 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/01/29 13:55:30 maya Exp $
+# $NetBSD: Makefile,v 1.25 2018/01/29 14:23:26 maya Exp $
 #
 
 # Note -- version number also in the do-install rule
@@ -7,7 +7,7 @@
 
 DISTNAME=              memtest86+-${MAJVER}.${MINVER}
 PKGNAME=               memtestplus-${MAJVER}.${MINVER}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.memtest.org/download/${MAJVER}.${MINVER}/
 
diff -r 666c22c3fb88 -r 6d68c1f9aa70 sysutils/memtestplus/distinfo
--- a/sysutils/memtestplus/distinfo     Mon Jan 29 14:15:57 2018 +0000
+++ b/sysutils/memtestplus/distinfo     Mon Jan 29 14:23:26 2018 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.14 2018/01/29 13:55:30 maya Exp $
+$NetBSD: distinfo,v 1.15 2018/01/29 14:23:26 maya Exp $
 
 SHA1 (memtest86+-5.01.tar.gz) = eb4b6d70114db3c9ed320785da44c0ba8349c10c
 RMD160 (memtest86+-5.01.tar.gz) = 756b57d8f8a3b7408aba0b2fc0cadcdc1df966df
 SHA512 (memtest86+-5.01.tar.gz) = d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
 Size (memtest86+-5.01.tar.gz) = 214877 bytes
-SHA1 (patch-aa) = df9482d024449c6fc853f01a90b045e139d07430
+SHA1 (patch-aa) = df0b88c93ddf6c07066ef993db80cc1b2874337c
 SHA1 (patch-ab) = 04ca819d23656c5a73625b457ad730c0cf33e751
 SHA1 (patch-ac) = 9186952e34139b4d4aab6c266a224921a4d39659
 SHA1 (patch-ad) = ab31fec30052fdd3c473ee885ba00d7e3676384f
 SHA1 (patch-controller.c) = 8509599b72f1f11115dc58605b0f438ddfca9b4a
-SHA1 (patch-main.c) = 1d620fd9e1cc04a9fb739eb3c1e6515f8f8d5179
+SHA1 (patch-main.c) = 7f199aa47f429c21ceee127e19120b51a300feac
 SHA1 (patch-makeiso.sh) = 939056a96a1384e4d27772bf5612a755deca8145
 SHA1 (patch-nbstart.S) = d97a6e9c25a57d0f5510c3acf4dccf0f0c0c31b0
 SHA1 (patch-reboot.c) = 8103cb52d1a6e2cdb9099ad3535115617746ed26
diff -r 666c22c3fb88 -r 6d68c1f9aa70 sysutils/memtestplus/patches/patch-aa
--- a/sysutils/memtestplus/patches/patch-aa     Mon Jan 29 14:15:57 2018 +0000
+++ b/sysutils/memtestplus/patches/patch-aa     Mon Jan 29 14:23:26 2018 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2015/03/21 02:18:39 tnn Exp $
+$NetBSD: patch-aa,v 1.7 2018/01/29 14:23:26 maya Exp $
 
 --- Makefile.orig      2013-08-10 02:01:58.000000000 +0000
 +++ Makefile
-@@ -7,7 +7,7 @@
+@@ -7,12 +7,12 @@
  #
  # Path for the floppy disk device
  #
@@ -11,6 +11,12 @@
  
  AS=as -32
  CC=gcc
+ 
+-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
++CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+       -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
+       
+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
 @@ -20,22 +20,24 @@ OBJS= head.o reloc.o main.o test.o init.
        smp.o vmem.o random.o
        
diff -r 666c22c3fb88 -r 6d68c1f9aa70 sysutils/memtestplus/patches/patch-main.c
--- a/sysutils/memtestplus/patches/patch-main.c Mon Jan 29 14:15:57 2018 +0000
+++ b/sysutils/memtestplus/patches/patch-main.c Mon Jan 29 14:23:26 2018 +0000
@@ -1,20 +1,9 @@
-$NetBSD: patch-main.c,v 1.2 2018/01/29 13:55:30 maya Exp $
+$NetBSD: patch-main.c,v 1.3 2018/01/29 14:23:26 maya Exp $
 
-Disable one of the tests that causes reboots/hangs at setup
-(XXX figure out why - use btflag and btrace to debug this)
-Clang fix
+Clang fix.
 
 --- main.c.orig        2013-08-10 02:01:58.000000000 +0000
 +++ main.c
-@@ -54,7 +54,7 @@ struct tseq tseq[] = {
-       {1, 32,  3,   6, 0, "[Moving inversions, 1s & 0s Parallel]  "},
-       {1, 32,  5,   3, 0, "[Moving inversions, 8 bit pattern]     "},
-       {1, 32,  6,  30, 0, "[Moving inversions, random pattern]    "},
--      {1, 32,  7,  81, 0, "[Block move]                           "}, 
-+      //{1, 32,  7,  81, 0, "[Block move]                           "},
-       {1,  1,  8,   3, 0, "[Moving inversions, 32 bit pattern]    "}, 
-       {1, 32,  9,  48, 0, "[Random number sequence]               "},
-   {1, 32, 10,   6, 0, "[Modulo 20, Random pattern]            "},
 @@ -217,7 +217,11 @@ static void run_at(unsigned long addr, i
    spin_lock(&barr->mutex);