diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2005-01-02 19:15:26 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2005-01-02 19:15:26 +0000 |
| commit | d74e91d353708ef191ff3508dea3f0a89019c914 (patch) | |
| tree | 625dd0973f8f353cafeab58948e4c4beff0d138a /sys-apps/memtest86/files | |
| parent | Moved to dev-python. (diff) | |
| download | gentoo-2-d74e91d353708ef191ff3508dea3f0a89019c914.tar.gz gentoo-2-d74e91d353708ef191ff3508dea3f0a89019c914.tar.bz2 gentoo-2-d74e91d353708ef191ff3508dea3f0a89019c914.zip | |
Version bump, closes bug #76432.
Diffstat (limited to 'sys-apps/memtest86/files')
| -rw-r--r-- | sys-apps/memtest86/files/digest-memtest86-3.0-r2 | 1 | ||||
| -rw-r--r-- | sys-apps/memtest86/files/digest-memtest86-3.2 | 1 | ||||
| -rw-r--r-- | sys-apps/memtest86/files/memtest86-3.0.patch | 22 | ||||
| -rw-r--r-- | sys-apps/memtest86/files/memtest86-3.2-test-pic.patch | 20 |
4 files changed, 21 insertions, 23 deletions
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.0-r2 b/sys-apps/memtest86/files/digest-memtest86-3.0-r2 deleted file mode 100644 index 4fb55f53126a..000000000000 --- a/sys-apps/memtest86/files/digest-memtest86-3.0-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 fade21758538a5468ad9b8509edfde0d memtest86-3.0.tar.gz 104794 diff --git a/sys-apps/memtest86/files/digest-memtest86-3.2 b/sys-apps/memtest86/files/digest-memtest86-3.2 new file mode 100644 index 000000000000..7174d58c9383 --- /dev/null +++ b/sys-apps/memtest86/files/digest-memtest86-3.2 @@ -0,0 +1 @@ +MD5 46028d276c39c2eebe7759ba813f97df memtest86-3.2.tar.gz 131309 diff --git a/sys-apps/memtest86/files/memtest86-3.0.patch b/sys-apps/memtest86/files/memtest86-3.0.patch deleted file mode 100644 index 5b2cb66fba74..000000000000 --- a/sys-apps/memtest86/files/memtest86-3.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur memtest86-3.0-orig/memsize.c memtest86-3.0/memsize.c ---- memtest86-3.0-orig/memsize.c 2002-05-21 23:07:01.000000000 +0200 -+++ memtest86-3.0/memsize.c 2004-02-01 20:19:08.779217664 +0100 -@@ -18,6 +18,7 @@ - - extern ulong p1, p2; - extern volatile ulong *p; -+extern struct vars * const v; - - static void sort_pmap(void); - static int check_ram(void); -diff -Naur memtest86-3.0-orig/test.h memtest86-3.0/test.h ---- memtest86-3.0-orig/test.h 2002-05-21 23:06:16.000000000 +0200 -+++ memtest86-3.0/test.h 2004-02-01 20:19:00.885417704 +0100 -@@ -277,7 +277,6 @@ - #define FIRMWARE_PCBIOS 1 - #define FIRMWARE_LINUXBIOS 2 - --extern struct vars * const v; - extern unsigned char _start[], _end[], startup_32[]; - extern unsigned char _size, _pages; - diff --git a/sys-apps/memtest86/files/memtest86-3.2-test-pic.patch b/sys-apps/memtest86/files/memtest86-3.2-test-pic.patch new file mode 100644 index 000000000000..aae58b26974e --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-3.2-test-pic.patch @@ -0,0 +1,20 @@ +--- Makefile.orig 2004-11-12 12:16:25.000000000 +0000 ++++ Makefile 2005-01-02 18:52:28.013459832 +0000 +@@ -12,7 +12,7 @@ + # + # gcc compiler options, these settings should suffice + # +-CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding ++CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector + + AS=as -32 + +@@ -24,7 +24,7 @@ + $(CC) -c -m32 -fPIC -Wall -O -fno-strict-aliasing reloc.c + + test.o: test.c test.h defs.h config.h +- $(CC) -c $(CCFLAGS) test.c ++ $(CC) -c $(CCFLAGS) -fno-PIC test.c + + main.o: main.c test.h defs.h + $(CC) -c $(CCFLAGS) -fPIC main.c |