Update to EAPI=4 and fix linking with newer gcc versions #363535 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

4 files changed, 76 insertions, 18 deletions

diff --git a/sys-boot/cromwell/ChangeLog b/sys-boot/cromwell/ChangeLog
index db3e9110c945..4d09f22b0648 100644
--- a/sys-boot/cromwell/ChangeLog
+++ b/sys-boot/cromwell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/cromwell
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/cromwell/ChangeLog,v 1.14 2011/04/15 10:00:25 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/cromwell/ChangeLog,v 1.15 2012/05/13 20:46:13 vapier Exp $
+
+  13 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/cromwell-2.40-gcc-4.6.patch, cromwell-2.40-r3.ebuild:
+  Update to EAPI=4 and fix linking with newer gcc versions #363535 by Diego Elio
+  Pettenò.
 
   15 Apr 2011; Mike Frysinger <vapier@gentoo.org> cromwell-2.40-r3.ebuild:
   Respect toolchain build settings.
diff --git a/sys-boot/cromwell/Manifest b/sys-boot/cromwell/Manifest
index 0f4bb6b42cdb..a27f23c2b4a9 100644
--- a/sys-boot/cromwell/Manifest
+++ b/sys-boot/cromwell/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX cromwell-2.40-gcc-4.6.patch 838 RMD160 f9d9a5c011f752680600544096cc84ce8a9d3f81 SHA1 ed0f56ff56416da3726be279180395c95de7fde9 SHA256 dbacf5761adad60d744c905ab2d44d22b2f22bcee4e09bb70d826d22182491c7
 DIST cromwell-2.40-r3-cvs-fixes.patch.lzma 7075 RMD160 22e0986c3ee5157f47902095947765be6a1ecfa1 SHA1 1543334d54b31f1667657ed2d7b5107e2ef9d497 SHA256 97d50811000edc399e0323b5faeff169de86846f50439adbc59b6eeaf1bb12fd
 DIST cromwell-2.40.tar.bz2 943015 RMD160 0b1efe4bee94e9d4b130008641fe4d2989439f43 SHA1 ce1b1d5a39f2c319d79ddb162f927ea053e1f354 SHA256 115cf68afad311f6e7490c3091dfb81870416cec3f2cb35d30360a919888cc3c
-EBUILD cromwell-2.40-r3.ebuild 869 RMD160 c30db0f80f6710c3e8080445016b090b2624db95 SHA1 497eb3546907ab572085bdd5d3f3a85d72977232 SHA256 fcad372ec77a132fa804dd5065d4f473f0715acc28c061e6ce0c66994cb6eb96
-MISC ChangeLog 2266 RMD160 ee47f1e836c16be34e2dbe7386ebc358c1ef771e SHA1 f5bde1c0dd240217af911c9aacb961760098008f SHA256 fa4efcbed212c80e76dc28053a21a85d93a8423155fc04890dbb9b3518fb7642
+EBUILD cromwell-2.40-r3.ebuild 1006 RMD160 22d82bd92c3dcab2837946de346f0a1d76651529 SHA1 60b230df865c6840304f4df3e8f3048c366352b5 SHA256 382c5563a125af9460a7d8a3ad574dcdc66d13c42bf09e8408371b48a56182fe
+MISC ChangeLog 2473 RMD160 644752139f608ae6180bc64c1a220f33725e8504 SHA1 3133c24f974e5eef84fb9ab5173c86fac4f836e7 SHA256 5859b003783f87189db0e850a59b243e16c04d138d5d098a1e013a176bd7bf7c
 MISC metadata.xml 213 RMD160 bd8c3555a7b97a82edc5c3b353e6daaf04c76c33 SHA1 d0dd456e741194ee9456c96a92df62121047db65 SHA256 71b6e267424942a7a763d7b1cc2cf7524a940d3f7edc042ef074933b135a906e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk2oFzsACgkQaC/OocHi7JaUdwD/RTSVUZxeZ6pqDy/qBdc5RTYD
-8egEb9sj0Zi5wsSPFx8A/RSZDA/DrztqPmmNbXe2vbJGjvf2JcTTOKfhax3UVD3n
-=cN8Q
+iQIcBAEBAgAGBQJPsB23AAoJELEHsLL7fEFWMFoQAK8ZkEf76vsyVSzgX9RFjeYe
+fEfx5jxlQIBmX6qqsaqHC/tHBtu8i/8c5x8Dba8U+qTldnHxCrWEuCsEY81RFHOx
+4XqtlLoZqNVZ56rU46ZJxlwL7zGYZFeUyqUcpMMhz6RNlahk2Wkq+csvFimxzv9c
+Rg8gIg4H9mkQsnL68tk814A2KiRGBf7My7aaBHmZe8LJ++M27H21JL3yhd7aW4gh
+ICsr2gDcpCYpB+gggJrqhpmVhCXleD9mT+hPc8QGZRKUtavv7PM4iTybq/z0EJRp
+ynf3CzTk/IDS2/VVUy0GJOnwf1V2l1AN0dFL8u9X3az2C5FLo+FYnxtDamivinDr
+GDQfv24Gk7ZLFig3tTTRtz58xp5jCWdPsrrDfEZoO7Z4p4YEOxAOfBwqWJb2H+KU
+4ti9xAHwvA0Jo9gLGt8pR4iESwXa/tRRwMyVNjDNZClhjo3a4XfBT6PxNe+mt1pW
+oIEHTXY1OOQH+LxHRmNWRDHI+P11V5Auccn4uka9KFjcsvuY92ZM2jfUuRz89/Ct
+FkgNFI09xi0BV2Nn2WlTvkp1Yv/FljogSzwAbBn46C+5qjYgKxiTaGwedxdTfZRA
+PgnoAtv30hMvl6Tzojs2b4O2+iySqQlzSzrZ314pMe4afQxB6yPapT/DDlkbwgmD
+tZToNfuvO1e045KYK/Gr
+=/8T1
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/cromwell/cromwell-2.40-r3.ebuild b/sys-boot/cromwell/cromwell-2.40-r3.ebuild
index 3a0ddc8b23fd..53c5d362dcbf 100644
--- a/sys-boot/cromwell/cromwell-2.40-r3.ebuild
+++ b/sys-boot/cromwell/cromwell-2.40-r3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/cromwell/cromwell-2.40-r3.ebuild,v 1.6 2011/04/15 10:00:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/cromwell/cromwell-2.40-r3.ebuild,v 1.7 2012/05/13 20:46:13 vapier Exp $
 
-inherit eutils mount-boot toolchain-funcs
+EAPI="4"
+
+inherit eutils mount-boot toolchain-funcs flag-o-matic
 
 DESCRIPTION="Xbox boot loader"
 HOMEPAGE="http://www.xbox-linux.org/wiki/Cromwell"
@@ -15,21 +17,22 @@ KEYWORDS="-* x86"
 IUSE=""
 RESTRICT="strip"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${WORKDIR}"/${PF}-cvs-fixes.patch
-	sed -i 's:-Werror::' Makefile Rules.make
+	epatch "${FILESDIR}"/${P}-gcc-4.6.patch #363535
+	sed -i 's:-Werror:-m32:' Makefile Rules.make || die
+	sed -i '/^EXTRA_CFLAGS/s:$: -m32:' Rules.make boot_rom/Makefile || die
 	sed -i \
 		-e '/^bin.imagebld:/,$s:\<gcc\>:${CC}:' \
 		Makefile || die
+	append-flags -m32
 }
 
 src_compile() {
-	emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" || die
+	emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)"
 }
 
 src_install() {
 	insinto /boot/${PN}
-	doins image/cromwell{,_1024}.bin xbe/xromwell.xbe || die
+	doins image/cromwell{,_1024}.bin xbe/xromwell.xbe
 }
diff --git a/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch b/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch
new file mode 100644
index 000000000000..92de3b014b61
--- /dev/null
+++ b/sys-boot/cromwell/files/cromwell-2.40-gcc-4.6.patch
@@ -0,0 +1,39 @@
+newer gcc versions will output .text.unlikely which this linker script
+doesn't expect
+
+https://bugs.gentoo.org/363535
+
+--- a/scripts/ldscript-crom.ld
++++ b/scripts/ldscript-crom.ld
+@@ -21,7 +21,7 @@ SECTIONS {
+ 
+ 	.text LOW_ROM : AT ( 0 ){
+ 		_start_low_rom = . ;
+-		*(.text);
++		*(.text .text.*);
+ 		_end_low_rom = . ;
+ 	}
+ 
+@@ -67,4 +67,5 @@ SECTIONS {
+ 	
+ 	_end_complete_rom = SIZEOF(.text) + SIZEOF(.rodata) + SIZEOF(.data) + SIZEOF(.bss);
+ 
++	/DISCARD/ : { *(.eh_frame) }
+ }
+--- a/boot_rom/bootrom.ld
++++ b/boot_rom/bootrom.ld
+@@ -31,7 +31,7 @@ SECTIONS {
+ 	.text (RAM_CODE) : AT( SIZEOF(.low_rom) ) {
+ 		_ram_location = .;
+ 		_start_ramcopy = _end_rom;
+-		*(.text);
++		*(.text .text.*);
+ 		_start_checksum = _start_ramcopy - LOW_ROM;
+ 	}
+ 
+@@ -74,4 +74,5 @@ SECTIONS {
+ 	} = 0x90909090      
+ */
+ 
++	/DISCARD/ : { *(.eh_frame) }
+ }