From 6e7924eb6dcdb1d3f42904468a06ac1d7871c8af Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Fri, 20 Jul 2018 01:03:51 -0500
Subject: memtest86+-5.01-2.parabola2: rebuild

---
 libre/memtest86+/PKGBUILD                           | 16 ++++++++++------
 .../memtest86+-5.01-test-random-cflags.patch        | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 libre/memtest86+/memtest86+-5.01-test-random-cflags.patch

(limited to 'libre/memtest86+')

diff --git a/libre/memtest86+/PKGBUILD b/libre/memtest86+/PKGBUILD
index 57d09f64c..3369a5120 100644
--- a/libre/memtest86+/PKGBUILD
+++ b/libre/memtest86+/PKGBUILD
@@ -1,13 +1,14 @@
 # $Id: PKGBUILD 272944 2016-08-03 07:41:05Z eworm $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=memtest86+
 pkgver=5.01
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="An advanced memory diagnostic tool"
-arch=('any')
+arch=('x86_64' 'i686')
 url="http://www.memtest.org"
 license=('GPL2')
 makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
@@ -17,14 +18,16 @@ source=("http://www.memtest.org/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'multiboot.patch'
         "${pkgname}-5.01-O0.patch"
         "${pkgname}-5.01-array-size.patch"
-        'gcc-5.patch')
+        'gcc-5.patch'
+        'memtest86+-5.01-test-random-cflags.patch')
 sha1sums=('eb4b6d70114db3c9ed320785da44c0ba8349c10c'
           '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
           '31dc513de83e207e8e160b9f43c67c7f6dda48f2'
           '53d3c0106644e6e085b8576e48e9981e5ccc3145'
           '83e20932625bb38137b01c0cbe1b8528629e0a76'
           '04654951868e73b53a67ce3288f2bd1843b40870'
-          '225895ea59684a8d6a14c40d92db527dce8187c4')
+          '225895ea59684a8d6a14c40d92db527dce8187c4'
+          'a9e2b3b81ee2e2d1734ea4b0f21ef9b396789c0c')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -33,6 +36,7 @@ prepare() {
   patch -p1 -i ${srcdir}/${pkgname}-5.01-O0.patch
   patch -p1 -i ${srcdir}/${pkgname}-5.01-array-size.patch
   patch -p1 -i ${srcdir}/gcc-5.patch
+  patch -p1 -i ${srcdir}/memtest86+-5.01-test-random-cflags.patch
   sed -i 's|CC[=]gcc|CC=gcc -I/usr/include|
           s|[-]fno[-]stack[-]protector|-fno-stack-protector -fno-aggressive-loop-optimizations|
           \|scp memtest[.]bin|d
diff --git a/libre/memtest86+/memtest86+-5.01-test-random-cflags.patch b/libre/memtest86+/memtest86+-5.01-test-random-cflags.patch
new file mode 100644
index 000000000..dcdccb8c6
--- /dev/null
+++ b/libre/memtest86+/memtest86+-5.01-test-random-cflags.patch
@@ -0,0 +1,21 @@
+make sure we re-use the existing CFLAGS settings so that we get all the right
+flags (like -fno-stack-protector).  just append the few changes we want (the
+optimization levels).
+
+https://bugs.gentoo.org/590974
+
+--- a/Makefile
++++ b/Makefile
+@@ -52,10 +52,10 @@ reloc.o: reloc.c
+ 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
+ 
+ test.o: test.c
+-	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
++test.o: CFLAGS += -O0 -fno-PIC
+ 
+ random.o: random.c
+-	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
++random.o: CFLAGS += -O3 -fno-PIC
+ 	
+ # rule for build number generation  
+ build_number:
-- 
cgit v1.2.2