summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Shepherd <masterdriverz@gentoo.org>2006-12-17 11:07:56 +0000
committerCharlie Shepherd <masterdriverz@gentoo.org>2006-12-17 11:07:56 +0000
commite40a4277ca3e0b728521bc3774f734f72ab63c1a (patch)
tree264fe5c00a7e61ca3bf68d1a0c9a85f3c1f740ac /net-misc/mknbi/files
parentDropped old versions. Added note for people having the pg-hier USE-flag set. (diff)
downloadgentoo-2-e40a4277ca3e0b728521bc3774f734f72ab63c1a.tar.gz
gentoo-2-e40a4277ca3e0b728521bc3774f734f72ab63c1a.tar.bz2
gentoo-2-e40a4277ca3e0b728521bc3774f734f72ab63c1a.zip
Add patch to fix compilation under gcc-4; thanks to Phillip Lemon for the patch; bug 148091
(Portage version: 2.1.2_rc3-r1)
Diffstat (limited to 'net-misc/mknbi/files')
-rw-r--r--net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch b/net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch
new file mode 100644
index 000000000000..5c7c58386653
--- /dev/null
+++ b/net-misc/mknbi/files/mknbi-1.4.4-gcc4.patch
@@ -0,0 +1,27 @@
+diff -ruN mknbi-1.4.4/nfl.c mknbi-1.4.4.thor/nfl.c
+--- mknbi-1.4.4/nfl.c 2003-09-22 16:47:08.000000000 +0200
++++ mknbi-1.4.4.thor/nfl.c 2006-05-19 13:36:42.000000000 +0200
+@@ -666,7 +666,7 @@
+ if (bhdr->b_signature != ELF_BHDR_MAGIC) {
+ return;
+ }
+-
++ /* probably breaks nothing, but why declare unsigned char and make cast to (signed) char??? */
+ note = ((char *)bhdr) + sizeof(*bhdr);
+ end = ((char *)bhdr) + bhdr->b_size;
+ while (note < end) {
+diff -ruN mknbi-1.4.4/nfl.h mknbi-1.4.4.thor/nfl.h
+--- mknbi-1.4.4/nfl.h 2003-01-12 09:39:03.000000000 +0100
++++ mknbi-1.4.4.thor/nfl.h 2006-05-19 13:36:42.000000000 +0200
+@@ -182,7 +182,10 @@
+ extern int auto_fill;
+
+ /* This variable specifies which console should be used. */
+-extern int terminal;
++/* Decide if you want static _or_ external!
++ gcc-4 finally starts complaining about this nonsense.
++ (plus: no file besides nfl.c uses this header anyway...)
++extern int terminal; */
+
+ #define TERMINAL_CONSOLE (1 << 0) /* keyboard and screen */
+ #define TERMINAL_SERIAL (1 << 1) /* serial console */