diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-08-16 08:14:16 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-08-16 08:14:16 +0000 |
| commit | 2df6c1394336d270de553f00fbe51a0b24befa8d (patch) | |
| tree | 8f8733397c1b2b301e4d4ce802e19a261cf8d3aa /sysutils/syslinux/files | |
| parent | - Add a new port: games/gti (diff) | |
Update to 4.05
Fix MASTER_SITES [1]
Give up maintainership
Notes
Notes:
svn path=/head/; revision=302619
Diffstat (limited to 'sysutils/syslinux/files')
| -rw-r--r-- | sysutils/syslinux/files/patch-com32-lib-MCONFIG | 11 | ||||
| -rw-r--r-- | sysutils/syslinux/files/patch-com32-lib-Makefile | 17 | ||||
| -rw-r--r-- | sysutils/syslinux/files/patch-mtools-Makefile | 14 |
3 files changed, 24 insertions, 18 deletions
diff --git a/sysutils/syslinux/files/patch-com32-lib-MCONFIG b/sysutils/syslinux/files/patch-com32-lib-MCONFIG deleted file mode 100644 index 85bf06474295..000000000000 --- a/sysutils/syslinux/files/patch-com32-lib-MCONFIG +++ /dev/null @@ -1,11 +0,0 @@ ---- com32/lib/MCONFIG.orig 2009-10-06 02:06:06.000000000 +0400 -+++ com32/lib/MCONFIG 2009-12-04 09:46:19.000000000 +0300 -@@ -45,7 +45,7 @@ - $(CC) $(MAKEDEPS) $(CFLAGS) -S -o $@ $< - - .S.o: -- $(CC) $(MAKEDEPS) $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $< -+ $(CC) $(MAKEDEPS) $(filter-out -std=gnu99, $(CFLAGS)) -D__ASSEMBLY__ -c -o $@ $< - - .S.s: - $(CC) $(MAKEDEPS) $(CFLAGS) -D__ASSEMBLY__ -E -o $@ $< diff --git a/sysutils/syslinux/files/patch-com32-lib-Makefile b/sysutils/syslinux/files/patch-com32-lib-Makefile new file mode 100644 index 000000000000..ebdb757d8483 --- /dev/null +++ b/sysutils/syslinux/files/patch-com32-lib-Makefile @@ -0,0 +1,17 @@ +--- com32/lib/Makefile.orig 2012-08-16 10:07:43.054505830 +0200 ++++ com32/lib/Makefile 2012-08-16 10:08:00.669820080 +0200 +@@ -183,12 +183,12 @@ + + # These files are performance critical, and doesn't compile well with -Os + sys/vesa/drawtxt.o: sys/vesa/drawtxt.c +- $(CC) $(MAKEDEPS) $(CFLAGS) -O3 -c -o $@ $< ++ $(CC) $(MAKEDEPS) $(filter-out -std=gnu99, $(CFLAGS)) -O3 -c -o $@ $< + + sys/vesa/alphatbl.c: sys/vesa/alphatbl.pl + $(PERL) $< > $@ + + jpeg/jidctflt.o: jpeg/jidctflt.c +- $(CC) $(MAKEDEPS) $(CFLAGS) -O3 -c -o $@ $< ++ $(CC) $(MAKEDEPS) $(filter-out -std=gnu99, $(CFLAGS)) -O3 -c -o $@ $< + + -include .*.d */.*.d */*/.*.d diff --git a/sysutils/syslinux/files/patch-mtools-Makefile b/sysutils/syslinux/files/patch-mtools-Makefile index add3529b4c18..483355c46ddb 100644 --- a/sysutils/syslinux/files/patch-mtools-Makefile +++ b/sysutils/syslinux/files/patch-mtools-Makefile @@ -1,13 +1,13 @@ ---- mtools/Makefile.orig 2010-11-16 15:44:53.882896167 +0100 -+++ mtools/Makefile 2010-11-16 15:45:31.261185647 +0100 -@@ -1,9 +1,8 @@ - topdir = .. - include $(topdir)/MCONFIG +--- mtools/Makefile.orig 2011-12-09 19:28:17.000000000 +0100 ++++ mtools/Makefile 2012-08-16 10:09:08.429505540 +0200 +@@ -2,9 +2,8 @@ + MAKEDIR = $(topdir)/mk + include $(MAKEDIR)/syslinux.mk -OPTFLAGS = -g -Os INCLUDES = -I. -I.. -I../libfat -I../libinstaller -CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -+CFLAGS += $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(INCLUDES) - LDFLAGS = -s ++CFLAGS += $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) + LDFLAGS = SRCS = syslinux.c \ |