diff options
| author | Dmitry Morozovsky <marck@FreeBSD.org> | 2010-10-13 20:35:34 +0000 |
|---|---|---|
| committer | Dmitry Morozovsky <marck@FreeBSD.org> | 2010-10-13 20:35:34 +0000 |
| commit | 910f5a58af4287223626c4d0bcd1335a9654ae54 (patch) | |
| tree | 7dabad67d4122e244aba7dfbd384f55537d64dca /sysutils/memtest86+ | |
| parent | 66c01c5e712494cddd15035a36b7c47a52b3eca6 (diff) | |
| download | ports-910f5a58af4287223626c4d0bcd1335a9654ae54.tar.gz ports-910f5a58af4287223626c4d0bcd1335a9654ae54.zip | |
Make it buildable of FreeBSD 6 (precisely, on pre-gcc 4.2 worlds) again by
removing -fno-stack-protector conditionally.
Reported by: pav (thanks for pointing out to recommended way to apply)
Approved by: avg (implicit)
Notes
Notes:
svn path=/head/; revision=262974
Diffstat (limited to 'sysutils/memtest86+')
| -rw-r--r-- | sysutils/memtest86+/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/memtest86+/files/extra-patch-Makefile | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile index 6564abea04c7..a0c0b154001e 100644 --- a/sysutils/memtest86+/Makefile +++ b/sysutils/memtest86+/Makefile @@ -42,6 +42,10 @@ USE_CDRTOOLS= yes ALL_TARGET+= iso .endif +.if ${OSVERSION} < 700042 ++EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile +.endif + pre-fetch: .if !defined(PACKAGE_BUILDING) @${ECHO} "If you only need bootable ISO image of memtest86+, you can" diff --git a/sysutils/memtest86+/files/extra-patch-Makefile b/sysutils/memtest86+/files/extra-patch-Makefile new file mode 100644 index 000000000000..5e4a263076ec --- /dev/null +++ b/sysutils/memtest86+/files/extra-patch-Makefile @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Makefile.orig ++++ Makefile +@@ -11,7 +11,7 @@ + AS=as -32 + CC=gcc + +-CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector ++CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC + + 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 spd.o \ |