Add patch to fix compilation under gcc-4; thanks to Phillip Lemon for the patch;...

Package-Manager: portage-2.1.2_rc3-r1

diff --git a/net-misc/mknbi/ChangeLog b/net-misc/mknbi/ChangeLog
index 6f40a53127fa1d57fbf21c4872e06076a5cd569a..a6164babf6df29dccec936d09e4dc49c4d0be6ec 100644 (file)
--- a/net-misc/mknbi/ChangeLog
+++ b/net-misc/mknbi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/mknbi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.15 2006/12/09 12:05:10 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.16 2006/12/17 11:07:56 masterdriverz Exp $
+
+  17 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/mknbi-1.4.4-gcc4.patch, mknbi-1.4.4.ebuild:
+  Add patch to fix compilation under gcc-4; thanks to Phillip Lemon for the
+  patch; bug 148091
 
   09 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
   -mknbi-1.2.11.ebuild, -mknbi-1.2.12.ebuild, -mknbi-1.4.0.ebuild,

diff --git a/net-misc/mknbi/Manifest b/net-misc/mknbi/Manifest
index bf88ddc8c8b53cd535bd9c224161743669f3a19c..14d2cfc1f1cc33f8df7c8a5bb7f442b5338cc33c 100644 (file)
--- a/net-misc/mknbi/Manifest
+++ b/net-misc/mknbi/Manifest
@@ -2,20 +2,24 @@ AUX mknbi-1.4.3-nossp.patch 511 RMD160 8f9e6b565eefd549308395754e0dac072bc93393
 MD5 dc84e8754114dacfcab0eb3615b5caad files/mknbi-1.4.3-nossp.patch 511
 RMD160 8f9e6b565eefd549308395754e0dac072bc93393 files/mknbi-1.4.3-nossp.patch 511
 SHA256 03a92c036fbaa8607b5d7bd3d2d0f8d2bf5c42118f8abf79c4502508b96b4fc7 files/mknbi-1.4.3-nossp.patch 511
+AUX mknbi-1.4.4-gcc4.patch 1065 RMD160 6515339316ecc6bdf8048c2b8c31265c4fe213f1 SHA1 4c5f21e1388012a8e492483d6a16c34f698bbcc9 SHA256 19c199a163b8cf67a7cad992dc75568449050fbde7e625b0a86bef648b6aa48d
+MD5 082f9195170ee9e18081809f7142ce2d files/mknbi-1.4.4-gcc4.patch 1065
+RMD160 6515339316ecc6bdf8048c2b8c31265c4fe213f1 files/mknbi-1.4.4-gcc4.patch 1065
+SHA256 19c199a163b8cf67a7cad992dc75568449050fbde7e625b0a86bef648b6aa48d files/mknbi-1.4.4-gcc4.patch 1065
 DIST mknbi-1.4.3.tar.gz 207576
 DIST mknbi-1.4.4.tar.gz 212454 RMD160 05c8ea64b57d83c7028a613cb64b12c0481c1462 SHA1 dc5d2c33d3b0bd133a27cc1b4995a0cbbd38f812 SHA256 e5c62131a79cebf31234af252975d4c242ed8face0249f11a5772aeff50e3f02
 EBUILD mknbi-1.4.3.ebuild 1083 RMD160 138699a73d7cf37a89b2730a8e729c499d4cf357 SHA1 7daa09859a9353b5c4ff5361f45f1980f773e5ad SHA256 b8615eb57de7212d8451597e40cc277ecaf43ee8b99339c3d7a8eba66fe0b5a5
 MD5 a39f5d5775f290a6880eb1fa95ebf33a mknbi-1.4.3.ebuild 1083
 RMD160 138699a73d7cf37a89b2730a8e729c499d4cf357 mknbi-1.4.3.ebuild 1083
 SHA256 b8615eb57de7212d8451597e40cc277ecaf43ee8b99339c3d7a8eba66fe0b5a5 mknbi-1.4.3.ebuild 1083
-EBUILD mknbi-1.4.4.ebuild 1102 RMD160 acfcabde6dfec51d45c3d0047edca729a03a5614 SHA1 a250ab4796030329dfba48c40fa9e281dae05903 SHA256 4ee9b3304b22546a4a8f519e71642ddeb53e5df40986ac7dc0cd6e37117991b6
-MD5 8d4ed8cd5d1ed78702d24e9581131189 mknbi-1.4.4.ebuild 1102
-RMD160 acfcabde6dfec51d45c3d0047edca729a03a5614 mknbi-1.4.4.ebuild 1102
-SHA256 4ee9b3304b22546a4a8f519e71642ddeb53e5df40986ac7dc0cd6e37117991b6 mknbi-1.4.4.ebuild 1102
-MISC ChangeLog 2224 RMD160 60b4d24e8ba97478a70c946ec9b0fe35787ba055 SHA1 00281a350c04a47f10d810589a7fc7a1d39c692c SHA256 e26275cff2d1d62e8386e1532a8fcefa284da7b8eb97038fb16bddbf84a971f2
-MD5 54e78730f9e27c6c35fce6f18126bd1a ChangeLog 2224
-RMD160 60b4d24e8ba97478a70c946ec9b0fe35787ba055 ChangeLog 2224
-SHA256 e26275cff2d1d62e8386e1532a8fcefa284da7b8eb97038fb16bddbf84a971f2 ChangeLog 2224
+EBUILD mknbi-1.4.4.ebuild 1188 RMD160 6f34f6f5357cd7cc753c42052978d3d1608fa497 SHA1 98d281abe3367ca6358bc0faafac2105ebf15b49 SHA256 2c023d2bb6b1b6a3f1957ad75d74d3cc3542a0462321ef5a74f887ecb9b21195
+MD5 d0b4394f22d9fc89820d9366f810f584 mknbi-1.4.4.ebuild 1188
+RMD160 6f34f6f5357cd7cc753c42052978d3d1608fa497 mknbi-1.4.4.ebuild 1188
+SHA256 2c023d2bb6b1b6a3f1957ad75d74d3cc3542a0462321ef5a74f887ecb9b21195 mknbi-1.4.4.ebuild 1188
+MISC ChangeLog 2433 RMD160 579de3770781a769f5e904e6299a0aa333a69161 SHA1 7d31e70cc4b60db859a29f6cdceb72a75363e060 SHA256 468e242927706d9bb9eb91ecd85b306abe4c5ffe6d93375bdabcd09ba112894c
+MD5 0087be499e95d021b872398c6ec1b814 ChangeLog 2433
+RMD160 579de3770781a769f5e904e6299a0aa333a69161 ChangeLog 2433
+SHA256 468e242927706d9bb9eb91ecd85b306abe4c5ffe6d93375bdabcd09ba112894c ChangeLog 2433
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236

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 (file)
index 0000000..5c7c583
--- /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 */

diff --git a/net-misc/mknbi/mknbi-1.4.4.ebuild b/net-misc/mknbi/mknbi-1.4.4.ebuild
index c34d43437229f60980b4682d5b54c272108132db..48fd3d0cec77f9b65c193e81d2d8f7b3eefcae7f 100644 (file)
--- a/net-misc/mknbi/mknbi-1.4.4.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.4.ebuild,v 1.2 2006/12/09 12:05:10 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.4.ebuild,v 1.3 2006/12/17 11:07:56 masterdriverz Exp $
 
 inherit toolchain-funcs eutils
 
@@ -22,19 +22,18 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/mknbi-1.4.3-nossp.patch
-}
-
-src_compile() {
+       epatch "${FILESDIR}"/${P}-gcc4.patch
        sed -i -e "s:\/usr\/local:\/usr:"  Makefile
 
        #apply modifications to CFLAGS to fix for gcc 3.4: bug #64049
        if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
        then
-               sed -i -e "s:\-mcpu:\-mtune:" Makefile
-               sed -i -e "s:CFLAGS=:CFLAGS= -minline-all-stringops:" Makefile
+               sed -i -e 's:\-mcpu:\-mtune:' Makefile
+               sed -i -e 's:CFLAGS=:CFLAGS= -minline-all-stringops:' Makefile
+       fi
+       if [ "`gcc-major-version`" = "4" ]; then
+               sed -i -e 's:\-fno-stack-protector-all::' Makefile
        fi
-
-       emake || die "Compile failed"
 }
 
 src_install() {