Bug #233927, compile-fix for PPC, tested on my G5.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64
RepoMan-Options: --force

4 files changed, 22 insertions, 4 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 4c0cd8897852..c4f0d12bb904 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.192 2008/08/02 15:20:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.193 2008/08/13 21:59:04 robbat2 Exp $
+
+  13 Aug 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/busybox-1.11.1-ppc-ifile.patch, busybox-1.11.1.ebuild:
+  Bug #233927, compile-fix for PPC, tested on my G5.
 
 *busybox-1.11.1 (02 Aug 2008)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a03d2e52e873..75d77743dd5c 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,6 +1,7 @@
 AUX busybox-1.10.1-mdev-exec.patch 384 RMD160 b42cdf99289bc6c159b1967726d2968dcd3f45b2 SHA1 d0e5799917797cc980a4ba02687d608a5e7c75ff SHA256 fa37a7178b25e59958d38b7ce4ef96540e5769d031f95762ebc59dad35a3e7b5
 AUX busybox-1.10.3-tcpudp.patch 348 RMD160 e7597d11e904007b08f5cd56b6d00795a9e15f63 SHA1 954e2d476084c8fc34c92a905c0139cb8af0c02f SHA256 2ab4f43c1beac4f5d84da625db9f14be67b5c1dae146246ac979439267cc7552
 AUX busybox-1.11.1-bb.patch 1059 RMD160 819a97b81f51314d400c86748d933e3cb1f1fcd3 SHA1 31a51bb6b7a5d1bfe32e54945eb71aac857e10ce SHA256 50d2f574093e52793dd5a08f35b275c2dddca8a76ff35e13e214dd6cd3654098
+AUX busybox-1.11.1-ppc-ifile.patch 511 RMD160 4c7843154f75eb66bdf222d9f0f9c8cb19414a0f SHA1 56b0d90f4ce6a134dbf4d1d6b8b75d7a5cc62d72 SHA256 c2d72ec6774ee82e168df5cad4f84cb04dc6ff61c9ea0914b3430ad95faf2d6d
 AUX busybox-1.7.0-bb.patch 880 RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 SHA1 8d515d3c2474e0f4d43015159b75e42de0d29cb1 SHA256 83c62f48e3ad89a77b2e0dd74d8ffa586faf2d112c3540c930f39e4abf3ccd55
 AUX busybox-1.7.4-signal-hack.patch 559 RMD160 4be7ab4379d4d4523fb7139a9ea6d1d885256612 SHA1 2427c3a5509fd04a3215c241c66291778cb19ae0 SHA256 541ab9a625acbb21ad413151f02ede8ab19e32d3a3583f5ca35d4713161bb567
 AUX busybox-1.9.0-allno.patch 1179 RMD160 32d9813d9bc5ec998e7eb0f1e0f04066da0e34d3 SHA1 d902d31244d31778a8a21081a801f0f458a54e8f SHA256 40a38c927502233171db99c530e8c2282a6f63a1495d0c29c268827713700d0c
@@ -26,10 +27,10 @@ EBUILD busybox-1.10.1-r2.ebuild 7438 RMD160 1164de735e8470ed350d89921dcd7f0fa994
 EBUILD busybox-1.10.1-r3.ebuild 7496 RMD160 9dd4680dfa64e94acbf3a30f0413d123d257474b SHA1 adb16b89db2cd518db6353b836c8aecff3d5930d SHA256 892ce726b8a2f0cb1f4c75451a9ca98d6f37e0a0a583fc86e1f5fa9eea4f9ee8
 EBUILD busybox-1.10.1.ebuild 7095 RMD160 a9bfb8d7e1acedfbc9d9c256cfad98293953cf1e SHA1 6798221aa9e7ef654f1ef006da2e72595ad48845 SHA256 c2b7c238ac6f106ba88fb409d1b73a6b5c1b321e3f04d16f2525f26fb8b84251
 EBUILD busybox-1.10.3.ebuild 7274 RMD160 f468d93a7892d47cb2236481db396c89dd2c74d9 SHA1 1025827dca18223d630c288b2cfa68e5fed7b117 SHA256 7c5b5a74728fe4f00ecf207ccc92646224d3630e46eb58601c654cc2b281aeac
-EBUILD busybox-1.11.1.ebuild 7225 RMD160 76a2f740c779cb84d6ce1f1e1a29291d40996226 SHA1 f6198adfe80655c0216c646830ad29b181bed329 SHA256 0d82d50e8c1bb9cfc1db47215fbaf323780c84e98e876dff0b97da4bfe14a9c8
+EBUILD busybox-1.11.1.ebuild 7280 RMD160 f68fcf0a9adb62ddf205a88b3d8358f0659fc76b SHA1 1af466dcd3183b4c1839452069e4d99ae90ed200 SHA256 694513438edb2ef8cd5f637a7deae64c5700d880b1f77c95bc9dd6dc2797c1a7
 EBUILD busybox-1.7.4.ebuild 7065 RMD160 c15b1f193f6e6064b129ab0d3988b5a7661c484e SHA1 bd04231092d736a8d84cecaac30638a80746d5b8 SHA256 295a507bfde7316606b4b8bac650a131fec9e61ef55a2356a4d29d0a0bb873e6
 EBUILD busybox-1.8.2.ebuild 7099 RMD160 6706ad0a141250ffb9668d8d5bf1e43c31102573 SHA1 2ba84fedc138067b0a65067ef903bcdd4adce284 SHA256 9df161c10b79f3b446f816af495638354bcc2c6129c8ef880cd8a8d5234cbc0d
 EBUILD busybox-1.9.0.ebuild 7101 RMD160 228234953d5a8a6bb0580828ac53d724e1a9c784 SHA1 befa00b876bb64fde773e2420dad608de9437344 SHA256 0d954b94a2b01e84b6d71b15e41f9ce239995908b873e57e2ab9a1bd706c5a6d
 EBUILD busybox-1.9.2.ebuild 7063 RMD160 738b8532ae768be8605b6fb3e1044f680568416e SHA1 add0013f17528f2137bde9258c9654edcc7d6a55 SHA256 c1f0002bda1126037dc3b06873e7e7606cee7b49f17199902f56e90b19862291
-MISC ChangeLog 28522 RMD160 757425c4f83363c721a49a2eb8f14eca268929fb SHA1 5c9e10ae104635ca4dd1f82c7b59ffa8e2b747ad SHA256 dfc6f61282113d0956ff560a57d81201412c0ed270dcb38883a0205ac57e1939
+MISC ChangeLog 28695 RMD160 a1352223753275804e4c6b420295c713b864f6c9 SHA1 ed854376e89bc6db60b28e47b512791ee470fd3a SHA256 52be4fb0a17044478df0d0d517c06db44a263d5f80877725f0f96fb57317d09c
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
diff --git a/sys-apps/busybox/busybox-1.11.1.ebuild b/sys-apps/busybox/busybox-1.11.1.ebuild
index 33960bd1f7cb..bbb448182c67 100644
--- a/sys-apps/busybox/busybox-1.11.1.ebuild
+++ b/sys-apps/busybox/busybox-1.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.11.1.ebuild,v 1.1 2008/08/02 15:20:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.11.1.ebuild,v 1.2 2008/08/13 21:59:04 robbat2 Exp $
 
 inherit eutils flag-o-matic savedconfig toolchain-funcs
 
@@ -86,6 +86,7 @@ src_unpack() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/busybox-1.11.1-bb.patch
+	epatch "${FILESDIR}"/busybox-1.11.1-ppc-ifile.patch
 
 	# include this upstream later..
 	epatch "${FILESDIR}"/busybox-devmem.patch
diff --git a/sys-apps/busybox/files/busybox-1.11.1-ppc-ifile.patch b/sys-apps/busybox/files/busybox-1.11.1-ppc-ifile.patch
new file mode 100644
index 000000000000..9a9cffa4e309
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.11.1-ppc-ifile.patch
@@ -0,0 +1,12 @@
+--- modutils/insmod.c.orig      2008-08-04 12:35:11.000000000 -0400
++++ modutils/insmod.c   2008-08-04 11:16:06.000000000 -0400
+@@ -840,7 +840,8 @@
+ 				ElfW(RelM) *rel, ElfW(Addr) v)
+ {
+ #if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \
+- || defined(__sh__) || defined(__s390__) || defined(__x86_64__)
++ || defined(__sh__) || defined(__s390__) || defined(__x86_64__) \
++ || defined(__powerpc__)
+ 	struct arch_file *ifile = (struct arch_file *) f;
+ #endif
+ 	enum obj_reloc ret = obj_reloc_ok;