summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-01-10 00:29:52 +0000
committerMike Frysinger <vapier@gentoo.org>2005-01-10 00:29:52 +0000
commit9c7d7b4be367c5fc6ca38af72f00ae8a4827d302 (patch)
treeab9e0eefba574d5a3a6fe58c57bbaa3d7b6d011a /sys-boot/syslinux
parentstabilize (Manifest recommit) (diff)
downloadgentoo-2-9c7d7b4be367c5fc6ca38af72f00ae8a4827d302.tar.gz
gentoo-2-9c7d7b4be367c5fc6ca38af72f00ae8a4827d302.tar.bz2
gentoo-2-9c7d7b4be367c5fc6ca38af72f00ae8a4827d302.zip
old
Diffstat (limited to 'sys-boot/syslinux')
-rw-r--r--sys-boot/syslinux/files/2.06-nasm.patch25
-rw-r--r--sys-boot/syslinux/files/syslinux-2.06-nossp.patch36
-rw-r--r--sys-boot/syslinux/files/syslinux-2.09-nossp.patch48
3 files changed, 0 insertions, 109 deletions
diff --git a/sys-boot/syslinux/files/2.06-nasm.patch b/sys-boot/syslinux/files/2.06-nasm.patch
deleted file mode 100644
index 21ed9a1bdc82..000000000000
--- a/sys-boot/syslinux/files/2.06-nasm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN syslinux-2.04.orig/memdisk/Makefile syslinux-2.04/memdisk/Makefile
---- syslinux-2.04.orig/memdisk/Makefile 2003-04-15 00:28:04.000000000 +0200
-+++ syslinux-2.04/memdisk/Makefile 2003-09-01 00:29:23.000000000 +0200
-@@ -60,10 +60,10 @@
- echo '.code16gcc' | cat - $< > $@
-
- %.s: %.S
-- $(CC) -x c $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
-+ $(CC) -x assembler-with-cpp $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
-
- %.s16: %.S16
-- $(CC) -x c $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
-+ $(CC) -x assembler-with-cpp $(INCLUDE) $(CFLAGS) -traditional -E -o $@ $<
-
- %.s: %.c
- $(CC) $(INCLUDE) $(CFLAGS) -S -o $@ $<
-@@ -98,7 +98,7 @@
- .depend:
- rm -f .depend
- for csrc in *.c ; do $(CC) $(INCLUDE) -MM $$csrc | sed -e 's/\.o/\.s/' >> .depend ; done
-- for ssrc in $(SSRC) ; do $(CC) $(INCLUDE) -x c -traditional -MM $$ssrc | sed -e 's/\.S16\.o/\.o16/' >> .depend ; done
-+ for ssrc in $(SSRC) ; do $(CC) $(INCLUDE) -x assembler-with-cpp -traditional -MM $$ssrc | sed -e 's/\.o/\.o16/' >> .depend ; done
- for nsrc in $(NASMSRC) ; do $(NASM) -DDEPEND $(NINCLUDE) -o `echo $$nsrc | sed -e 's/\.asm/\.bin/'` -M $$nsrc >> .depend ; done
-
- depend:
diff --git a/sys-boot/syslinux/files/syslinux-2.06-nossp.patch b/sys-boot/syslinux/files/syslinux-2.06-nossp.patch
deleted file mode 100644
index a1175ada2e82..000000000000
--- a/sys-boot/syslinux/files/syslinux-2.06-nossp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nrup syslinux-2.06/Makefile syslinux-2.06-solar/Makefile
---- syslinux-2.06/Makefile 2004-04-28 23:31:56.000000000 -0400
-+++ syslinux-2.06-solar/Makefile 2004-04-28 23:32:40.000000000 -0400
-@@ -18,7 +18,7 @@
- OSTYPE = $(shell uname -msr)
- CC = gcc
- INCLUDE =
--CFLAGS = -Wall -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-+CFLAGS = -Wall -O2 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
- PIC = -fPIC
- LDFLAGS = -O2 -s
- AR = ar
-diff -Nrup syslinux-2.06/memdisk/Makefile syslinux-2.06-solar/memdisk/Makefile
---- syslinux-2.06/memdisk/Makefile 2004-04-28 23:31:55.000000000 -0400
-+++ syslinux-2.06-solar/memdisk/Makefile 2004-04-28 23:33:34.000000000 -0400
-@@ -14,7 +14,7 @@
- VERSION := $(shell cat ../version)
-
- CC = gcc
--CFLAGS = -g -Wall -O2 -fomit-frame-pointer -march=i386 \
-+CFLAGS = -g -Wall -fno-stack-protector -O2 -fomit-frame-pointer -march=i386 \
- -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
- -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
- LDFLAGS = -g
-diff -Nrup syslinux-2.06/sample/Makefile syslinux-2.06-solar/sample/Makefile
---- syslinux-2.06/sample/Makefile 2002-11-18 20:00:31.000000000 -0500
-+++ syslinux-2.06-solar/sample/Makefile 2004-04-28 23:33:56.000000000 -0400
-@@ -17,7 +17,7 @@
-
- CC = gcc
- LD = ld
--CFLAGS = -march=i386 -O2 -fomit-frame-pointer -I../com32/include
-+CFLAGS = -march=i386 -O2 -fomit-frame-pointer -I../com32/include -fno-stack-protector
- SFLAGS = -march=i386
- LDFLAGS = -s
- OBJCOPY = objcopy
diff --git a/sys-boot/syslinux/files/syslinux-2.09-nossp.patch b/sys-boot/syslinux/files/syslinux-2.09-nossp.patch
deleted file mode 100644
index 1390e17d478f..000000000000
--- a/sys-boot/syslinux/files/syslinux-2.09-nossp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nru syslinux-2.09/Makefile syslinux-2.09-solar/Makefile
---- syslinux-2.09/Makefile 2004-02-02 03:47:24.000000000 -0500
-+++ syslinux-2.09-solar/Makefile 2004-04-28 23:43:00.000000000 -0400
-@@ -18,7 +18,7 @@
- OSTYPE = $(shell uname -msr)
- CC = gcc
- INCLUDE =
--CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-+CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fno-stack-protector
- PIC = -fPIC
- LDFLAGS = -O2 -s
- AR = ar
-diff -Nru syslinux-2.09/memdisk/Makefile syslinux-2.09-solar/memdisk/Makefile
---- syslinux-2.09/memdisk/Makefile 2004-01-24 16:37:22.000000000 -0500
-+++ syslinux-2.09-solar/memdisk/Makefile 2004-04-28 23:43:20.000000000 -0400
-@@ -20,7 +20,7 @@
- ALIGN := $(call gcc_ok,-falign-functions=0 -falign-jumps=0 -falign-loops=0,-malign-functions=0 -malign-jumps=0 -malign-loops=0)
-
- CC = gcc $(M32)
--CFLAGS = -g -W -Wall -Os -fomit-frame-pointer -march=i386 $(ALIGN) \
-+CFLAGS = -g -W -Wall -Os -fomit-frame-pointer -march=i386 $(ALIGN) -fno-stack-protector \
- -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"'
- LDFLAGS = -g
- INCLUDE = -I../com32/include
-diff -Nru syslinux-2.09/menu/Makefile syslinux-2.09-solar/menu/Makefile
---- syslinux-2.09/menu/Makefile 2004-02-25 01:48:05.000000000 -0500
-+++ syslinux-2.09-solar/menu/Makefile 2004-04-28 23:43:50.000000000 -0400
-@@ -5,7 +5,7 @@
- ALIGN := $(call gcc_ok,-falign-functions=0 -falign-jumps=0 -falign-loops=0,-malign-functions=0 -malign-jumps=0 -malign-loops=0)
-
- CC = gcc
--CFLAGS = $(M32) -funsigned-char -g -W -Wall -march=i386 $(ALIGN) -Os
-+CFLAGS = $(M32) -funsigned-char -g -W -Wall -march=i386 $(ALIGN) -Os -fno-stack-protector
- AR = ar
- AS = as
- LD = ld -m elf_i386
-diff -Nru syslinux-2.09/sample/Makefile syslinux-2.09-solar/sample/Makefile
---- syslinux-2.09/sample/Makefile 2004-01-24 16:37:22.000000000 -0500
-+++ syslinux-2.09-solar/sample/Makefile 2004-04-28 23:44:09.000000000 -0400
-@@ -25,7 +25,7 @@
- AR = ar
- NASM = nasm
- RANLIB = ranlib
--CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include
-+CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include -fno-stack-protector
- SFLAGS = -march=i386
- LDFLAGS = -s
- OBJCOPY = objcopy