diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2008-02-14 14:06:18 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2008-02-14 14:06:18 +0000 |
| commit | f2b205a6c31226232eff439bb694ecdfb15ad9ab (patch) | |
| tree | a6297e134538b9ca2e6defcf26c7bbef75756d11 /sys-apps | |
| parent | alpha/ia64 stable wrt #209465 (diff) | |
| download | gentoo-2-f2b205a6c31226232eff439bb694ecdfb15ad9ab.tar.gz gentoo-2-f2b205a6c31226232eff439bb694ecdfb15ad9ab.tar.bz2 gentoo-2-f2b205a6c31226232eff439bb694ecdfb15ad9ab.zip | |
Fix bug #210019.
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/memtest86+/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog index c8c60a28d31b..257c06858122 100644 --- a/sys-apps/memtest86+/ChangeLog +++ b/sys-apps/memtest86+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/memtest86+ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.38 2008/02/10 19:18:53 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.39 2008/02/14 14:06:17 spock Exp $ + + 14 Feb 2008; Michał Januszewski <spock@gentoo.org> + files/memtest86+-2.00-hardcoded_cc.patch: + Fix bug #210019. *memtest86+-2.00 (10 Feb 2008) diff --git a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch index 449b1bf3ddec..98b8f692a893 100644 --- a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch +++ b/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch @@ -1,6 +1,6 @@ diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile ---- memtest86+-2.00-orig/Makefile 2008-02-10 19:50:30.000000000 +0100 -+++ memtest86+-2.00/Makefile 2008-02-10 20:05:30.000000000 +0100 +--- memtest86+-2.00-orig/Makefile 2008-02-14 15:01:14.000000000 +0100 ++++ memtest86+-2.00/Makefile 2008-02-14 15:03:00.000000000 +0100 @@ -8,9 +8,9 @@ # FDISK=/dev/fd0 @@ -14,7 +14,7 @@ diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile 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 \ -@@ -37,7 +37,7 @@ memtest.bin: memtest_shared.bin bootsect +@@ -37,10 +37,10 @@ memtest.bin: memtest_shared.bin bootsect memtest_shared.bin -o memtest.bin reloc.o: reloc.c @@ -22,4 +22,8 @@ diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile + $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c test.o: test.c - $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c +- $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c ++ $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c + + clean: + rm -f *.o memtest.bin memtest memtest_shared memtest_shared.bin |