FreeBSD Bugzilla – Attachment 139283 Details for
Bug 185509
net/mknbi: Support CC/CFLAGS properly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 10.19 KB, created by
tkato432
on 2014-01-05 18:10:03 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2014-01-05 18:10:03 UTC
Size:
10.19 KB
patch
obsolete
>diff -urN /usr/ports/net/mknbi/Makefile net/mknbi/Makefile >--- /usr/ports/net/mknbi/Makefile 2013-11-06 21:53:11.000000000 +0900 >+++ net/mknbi/Makefile 2014-01-06 00:00:00.000000000 +0900 >@@ -3,6 +3,7 @@ > > PORTNAME= mknbi > PORTVERSION= 1.4.4 >+PORTREVISION= 1 > CATEGORIES= net > MASTER_SITES= SF/etherboot/${PORTNAME}/${PORTVERSION} > >@@ -11,20 +12,12 @@ > > BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm > >-MAN1= mknbi.1 disnbi.1 >-.for i in mkelf.1 mknbi-linux.1 mkelf-linux.1 \ >- mknbi-rom.1 mkelf-img.1 mknbi-menu.1 mkelf-menu.1 \ >- mknbi-nfl.1 mkelf-nfl.1 mknbi-dos.1 mknbi-fdos.1 mkelf-lua.1 >-MLINKS+= mknbi.1 ${i} >-.endfor >+USES= gmake perl5 shebangfix >+SHEBANG_FILES= *.pl >+USE_CSTD= gnu89 > >-PORTDOCS= COPYING README LOG spec.txt >- >-USES= perl5 >-USE_GMAKE= yes > ONLY_FOR_ARCHS= i386 > >-NO_STAGE= yes > post-patch: > @${REINPLACE_CMD} -e 's,^static int terminal,int terminal,' \ > ${WRKSRC}/nfl.c >diff -urN /usr/ports/net/mknbi/files/patch-Makefile net/mknbi/files/patch-Makefile >--- /usr/ports/net/mknbi/files/patch-Makefile 2013-11-06 21:53:11.000000000 +0900 >+++ net/mknbi/files/patch-Makefile 2014-01-06 00:00:00.000000000 +0900 >@@ -1,11 +1,13 @@ >---- Makefile.orig Tue Aug 17 04:47:29 2004 >-+++ Makefile Thu Mar 17 21:33:37 2005 >-@@ -18,7 +18,7 @@ >+--- Makefile.orig 2004-08-17 11:47:29.000000000 +0900 >++++ Makefile 2013-12-24 05:17:46.000000000 +0900 >+@@ -17,8 +17,8 @@ >+ # This one makes multiple versions > FIRSTRELOCS= 0x92800 0x82800 > OLDGAS:= $(shell $(AS) --version | grep -q '2\.9\.1' && echo -DGAS291) >- CFLAGS= -I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \ >+-CFLAGS= -I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \ > - -mcpu=i386 \ >-+ -march=i386 \ >++CFLAGS+= -I. -ffreestanding -fstrength-reduce -fomit-frame-pointer \ >++ \ > -Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\" > LDBINARYFLAG= --oformat binary > FIRST32SIZE= 6144 >@@ -26,3 +28,172 @@ > > INSTALL= install > >+@@ -101,40 +101,40 @@ >+ $(LD) -N -Ttext $* -e _start $(LDBINARYFLAG) -o $@ start32@$*.o first32dos.o printf.o string.o >+ >+ start32@%.o: start32.S >+- gcc -E -DRELOC=$* $(OLDGAS) start32.S | $(AS) -o start32@$*.o >++ $(CC) -E -DRELOC=$* $(OLDGAS) start32.S | $(AS) -o start32@$*.o >+ >+ first32.o: first32.c etherboot.h start32.h >+- gcc $(CFLAGS) -o first32.o -c first32.c >++ $(CC) $(CFLAGS) -o first32.o -c first32.c >+ >+ first32elf.o: first32.c etherboot.h start32.h >+- gcc $(CFLAGS) -DFIRST32ELF -o first32elf.o -c first32.c >++ $(CC) $(CFLAGS) -DFIRST32ELF -o first32elf.o -c first32.c >+ >+ first32dos.o: first32.c etherboot.h start32.h >+- gcc $(CFLAGS) -DRELOC=$(F32DRELOC) -DFIRST32DOS -DFIRST32ELF -o first32dos.o -c first32.c >++ $(CC) $(CFLAGS) -DRELOC=$(F32DRELOC) -DFIRST32DOS -DFIRST32ELF -o first32dos.o -c first32.c >+ >+ memsizes.o: memsizes.c >+- gcc $(CFLAGS) -c $*.c >++ $(CC) $(CFLAGS) -c $*.c >+ >+ printf.o: printf.c >+- gcc $(CFLAGS) -c $*.c >++ $(CC) $(CFLAGS) -c $*.c >+ >+ # DOS first stage setup program, depend on Makefile for version number >+ first.dos: first-dos.S first-dos.h version-dos.h Makefile >+ ifeq ($(ASM),as86) >+- gcc $(ASMCFLAGS) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S >++ $(CC) $(ASMCFLAGS) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S >+ as86 -0 -b first.dos first-dos.s >+ else >+- gcc $(ASMCFLAGS) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S >++ $(CC) $(ASMCFLAGS) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S >+ nasm -f bin first-dos.s -o first.dos >+ endif >+ >+ # FreeDOS first stage setup program, depend on Makefile for version number >+ first.fdos: first-dos.S first-dos.h version-dos.h Makefile >+ ifeq ($(ASM),as86) >+- gcc $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S >++ $(CC) $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S >+ as86 -0 -b first.fdos first-fdos.s >+ else >+- gcc $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S >++ $(CC) $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S >+ nasm -f bin first-fdos.s -o first.fdos >+ endif >+ >+@@ -158,51 +158,51 @@ >+ >+ # LUA interpreter >+ lua/bin/lua: >+- cd lua; make >++ cd lua; $(MAKE) >+ >+ startmenu.o: startmenu.S startmenu.h >+- gcc -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S | $(AS) -o startmenu.o >++ $(CC) -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S | $(AS) -o startmenu.o >+ >+ menu.o: menu.c stddef.h string.h printf.h ansiesc.h \ >+ misc.h linux-asm-io.h etherboot.h >+- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >++ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >+ >+ bootmenu.o: bootmenu.h bootmenu.c stddef.h string.h md5.h misc.h etherboot.h start32.h >+- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >++ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >+ >+ string.o: string.h string.c >+- gcc $(CFLAGS) -c $*.c >++ $(CC) $(CFLAGS) -c $*.c >+ >+ ansiesc.o: ansiesc.h ansiesc.c stddef.h string.h etherboot.h >+- gcc $(CFLAGS) -DGFX -c $*.c >++ $(CC) $(CFLAGS) -DGFX -c $*.c >+ >+ md5.o: md5.h md5.c etherboot.h >+- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >++ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >+ >+ misc.o: misc.h misc.c ansiesc.h etherboot.h start32.h >+- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >++ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >+ >+ serial.o: serial.c >+- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >++ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c >+ >+ menu-simple.o: menu-simple.h menu-simple.c string.h etherboot.h >+- gcc $(CFLAGS) -c $*.c >++ $(CC) $(CFLAGS) -c $*.c >+ >+ # Remove ramdisk utility under DOS >+ rmrd.com: rmrd.S >+ ifeq ($(ASM),as86) >+- gcc $(ASMCFLAGS) -DUSE_AS86 -E -traditional -o rmrd.s rmrd.S >++ $(CC) $(ASMCFLAGS) -DUSE_AS86 -E -traditional -o rmrd.s rmrd.S >+ # -s appears to be necessary to start binary at 0x100 >+ as86 -0 -b rmrd.com -s rmrd.map rmrd.s >+ else >+- gcc $(ASMCFLAGS) -DUSE_NASM -E -traditional -o rmrd.s rmrd.S >++ $(CC) $(ASMCFLAGS) -DUSE_NASM -E -traditional -o rmrd.s rmrd.S >+ nasm -f bin rmrd.s -o rmrd.com >+ endif >+ >+ # Alternate boot block, taken from netboot mknbi-dos >+ # Not made by default because not everybody has as86 installed >+ $(ALTBOOT): altboot.S >+- gcc -E altboot.S > altboot.s >++ $(CC) -E altboot.S > altboot.s >+ as86 -s /dev/null -b $(ALTBOOT) altboot.s >+ $(RM) altboot.s >+ >+@@ -217,17 +217,17 @@ >+ pod2html menuc.pl > menuc.html >+ >+ install: all $(ALTBOOT) >+- -mkdir -p $(INSTLIBDIR) >+- $(INSTALL) $(PROG) $(INSTLIBDIR)/ >+- $(INSTALL) -m 644 $(MODULES) $(FIRSTS) $(ALTBOOT) $(RMRD) $(INSTLIBDIR)/ >++ -mkdir -p $(DESTDIR)$(INSTLIBDIR) >++ $(INSTALL) $(PROG) $(DESTDIR)$(INSTLIBDIR)/ >++ $(INSTALL) -m 644 $(MODULES) $(FIRSTS) $(ALTBOOT) $(RMRD) $(DESTDIR)$(INSTLIBDIR)/ >+ if [ -e lua-4.0.1/bin/lua ]; then \ >+ cp -p lua-4.0.1/bin/lua lua; \ >+ fi >+ if [ -e lua ]; then \ >+- $(INSTALL) -m 644 lua $(INSTLIBDIR)/lua; \ >++ $(INSTALL) -m 644 lua $(DESTDIR)$(INSTLIBDIR)/lua; \ >+ fi >+- -mkdir -p $(BINDIR) >+- cd $(BINDIR); \ >++ -mkdir -p $(DESTDIR)$(BINDIR) >++ cd $(DESTDIR)$(BINDIR); \ >+ for i in linux rom fdos dos menu nfl; \ >+ do \ >+ ln -sf ../lib/mknbi/mknbi mknbi-$$i; \ >+@@ -236,19 +236,19 @@ >+ do \ >+ ln -sf ../lib/mknbi/mknbi mkelf-$$i; \ >+ done >+- (cd $(BINDIR); ln -sf ../lib/mknbi/disnbi disnbi) >+- (cd $(BINDIR); ln -sf ../lib/mknbi/dismbr dismbr) >+- (cd $(BINDIR); ln -sf ../lib/mknbi/disdosbb disdosbb) >+- (cd $(BINDIR); ln -sf ../lib/mknbi/nbitoelf nbitoelf) >+- -mkdir -p $(MANDIR) >+- $(INSTALL) -m 644 mknbi.1 disnbi.1 $(MANDIR)/ >+- cd $(MANDIR); \ >++ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/disnbi disnbi) >++ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/dismbr dismbr) >++ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/disdosbb disdosbb) >++ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/nbitoelf nbitoelf) >++ -mkdir -p $(DESTDIR)$(MANDIR) >++ $(INSTALL) -m 644 mknbi.1 disnbi.1 $(DESTDIR)$(MANDIR)/ >++ cd $(DESTDIR)$(MANDIR); \ >+ for i in mkelf mknbi-linux mkelf-linux mknbi-rom mkelf-img mknbi-menu mkelf-menu mknbi-nfl mkelf-nfl mknbi-dos mknbi-fdos mkelf-lua; \ >+ do \ >+ ln -sf mknbi.1 $$i.1; \ >+ done >+- -mkdir -p $(DOCDIR) >+- $(INSTALL) -m 644 COPYING README LOG spec.txt $(DOCDIR)/ >++ -mkdir -p $(DESTDIR)$(DOCDIR) >++ $(INSTALL) -m 644 README LOG spec.txt $(DESTDIR)$(DOCDIR)/ >+ >+ tarball: >+ mkdir -p luabuild >diff -urN /usr/ports/net/mknbi/pkg-plist net/mknbi/pkg-plist >--- /usr/ports/net/mknbi/pkg-plist 2013-11-06 21:53:11.000000000 +0900 >+++ net/mknbi/pkg-plist 2014-01-06 00:00:00.000000000 +0900 >@@ -1,35 +1,53 @@ >-bin/mknbi-linux >-bin/mknbi-rom >-bin/mknbi-fdos >-bin/mknbi-dos >-bin/mknbi-menu >-bin/mknbi-nfl >-bin/mkelf-linux >+bin/disdosbb >+bin/dismbr >+bin/disnbi > bin/mkelf-img >+bin/mkelf-linux >+bin/mkelf-lua > bin/mkelf-menu > bin/mkelf-nfl >-bin/mkelf-lua >-bin/disnbi >-bin/dismbr >-bin/disdosbb >+bin/mknbi-dos >+bin/mknbi-fdos >+bin/mknbi-linux >+bin/mknbi-menu >+bin/mknbi-nfl >+bin/mknbi-rom > bin/nbitoelf >-lib/mknbi/mknbi >-lib/mknbi/disnbi >-lib/mknbi/dismbr >-lib/mknbi/disdosbb >-lib/mknbi/nbitoelf >-lib/mknbi/Nbi.pm > lib/mknbi/Elf.pm >+lib/mknbi/Nbi.pm > lib/mknbi/TruncFD.pm >-lib/mknbi/first32@0x92800.linux >-lib/mknbi/first32elf@0x92800.linux >-lib/mknbi/first32@0x82800.linux >-lib/mknbi/first32elf@0x82800.linux >+lib/mknbi/altboot.bin >+lib/mknbi/disdosbb >+lib/mknbi/dismbr >+lib/mknbi/disnbi > lib/mknbi/first.dos > lib/mknbi/first.fdos >+lib/mknbi/first32@0x82800.linux >+lib/mknbi/first32@0x92800.linux >+lib/mknbi/first32elf@0x82800.linux >+lib/mknbi/first32elf@0x92800.linux >+lib/mknbi/lua > lib/mknbi/menu >+lib/mknbi/mknbi >+lib/mknbi/nbitoelf > lib/mknbi/nfl >-lib/mknbi/altboot.bin > lib/mknbi/rmrd.com >-lib/mknbi/lua >+man/man1/disnbi.1.gz >+man/man1/mkelf.1.gz >+man/man1/mkelf-img.1.gz >+man/man1/mkelf-linux.1.gz >+man/man1/mkelf-lua.1.gz >+man/man1/mkelf-menu.1.gz >+man/man1/mkelf-nfl.1.gz >+man/man1/mknbi.1.gz >+man/man1/mknbi-dos.1.gz >+man/man1/mknbi-fdos.1.gz >+man/man1/mknbi-linux.1.gz >+man/man1/mknbi-menu.1.gz >+man/man1/mknbi-nfl.1.gz >+man/man1/mknbi-rom.1.gz >+%%PORTDOCS%%%%DOCSDIR%%/LOG >+%%PORTDOCS%%%%DOCSDIR%%/README >+%%PORTDOCS%%%%DOCSDIR%%/spec.txt >+%%PORTDOCS%%@dirrm %%DOCSDIR%% > @dirrm lib/mknbi
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 185509
: 139283