diff --git a/memtest86+/.md5sum b/memtest86+/.md5sum index 5ad766fc2..06c50426c 100644 --- a/memtest86+/.md5sum +++ b/memtest86+/.md5sum @@ -1,3 +1,2 @@ -3554b58e74e11ad17f01b9b2e218cd62 memtest86+-2.11-makefile_cflags_asflags.patch abdc336e015ba789c6e63321c0e99e81 memtest86+-2.11-makefile_install_remove.patch -e457774139c0bfef899359df91f49b3e memtest86+-2.11.tar.gz +ef62c2f5be616676c8c62066dedc46b3 memtest86+-4.20.tar.gz diff --git a/memtest86+/Pkgfile b/memtest86+/Pkgfile index 59db22514..7990535da 100644 --- a/memtest86+/Pkgfile +++ b/memtest86+/Pkgfile @@ -2,18 +2,15 @@ # URL: http://www.memtest.org/ # Maintainer: Danny Rawlins, monster dot romster at gmail dot com # Packager: Mark Rosenstand, mark at borkware dot net -# Depends on: name=memtest86+ -version=2.11 +version=4.20 release=1 source=(http://www.memtest.org/download/$version/$name-$version.tar.gz - memtest86+-2.11-makefile_cflags_asflags.patch memtest86+-2.11-makefile_install_remove.patch) build() { cd $name-$version - patch -p 1 -i $SRC/memtest86+-2.11-makefile_cflags_asflags.patch patch -p 1 -i $SRC/memtest86+-2.11-makefile_install_remove.patch make memtest.bin make DESTDIR=$PKG install-memtest.bin diff --git a/memtest86+/memtest86+-2.11-makefile_cflags_asflags.patch b/memtest86+/memtest86+-2.11-makefile_cflags_asflags.patch deleted file mode 100644 index 406118121..000000000 --- a/memtest86+/memtest86+-2.11-makefile_cflags_asflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -pruN memtest86+-2.11.orig/Makefile memtest86+-2.11/Makefile ---- memtest86+-2.11.orig/Makefile 2008-12-24 10:41:30.410800131 +0000 -+++ memtest86+-2.11/Makefile 2008-12-24 10:51:17.727550623 +0000 -@@ -8,10 +8,13 @@ - # - FDISK=/dev/fd0 - --AS=as -32 --CC=gcc -+AS?=as -+CC?=gcc - --CFLAGS= -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -+CPPFLAGS=-m32 -+CFLAGS?=-0s -march=i486 -fomit-frame-pointer -+CFLAGS+= -m32 -fPIC -Wall -ffreestanding -fno-builtin -+ASFLAGS=-32 - - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ - config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \