summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-10-18 19:13:43 +0000
committerAnthony G. Basile <blueness@gentoo.org>2013-10-18 19:13:43 +0000
commite3f9466955c9cd1ecc5df4e889be1f32002d6f61 (patch)
treeef1704102697a354fec9e735df10e7e5520c96e0 /sys-apps/memtest86
parentVersion bump wrt bug #488424. (diff)
downloadgentoo-2-e3f9466955c9cd1ecc5df4e889be1f32002d6f61.tar.gz
gentoo-2-e3f9466955c9cd1ecc5df4e889be1f32002d6f61.tar.bz2
gentoo-2-e3f9466955c9cd1ecc5df4e889be1f32002d6f61.zip
Fix -fno-pie for bug #487600
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'sys-apps/memtest86')
-rw-r--r--sys-apps/memtest86/ChangeLog6
-rw-r--r--sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch4
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 8b987841deb8..c54036cff1a0 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/memtest86
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.43 2013/10/10 20:53:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.44 2013/10/18 19:13:43 blueness Exp $
+
+ 18 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
+ files/memtest86-4.3.3-build-nopie.patch:
+ Fix -fno-pie for bug #487600
*memtest86-4.3.3-r1 (10 Oct 2013)
diff --git a/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch b/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch
index ff898a562e4b..adbbe6f86dc7 100644
--- a/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch
+++ b/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch
@@ -11,7 +11,7 @@ diff -Naur src.orig/Makefile src/Makefile
-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector -nopie $(SMP_FL)
++CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector -fno-pie $(SMP_FL)
OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
config.o memsize.o error.o smp.o cpuid.o vmem.o random.o
@@ -33,7 +33,7 @@ diff -Naur src.orig/Makefile src/Makefile
random.o: random.c
- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-+ $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -nopie random.c
++ $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie random.c
clean:
rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \