Fix building on ppc64 #122992 Markus Rothe.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 36 insertions, 12 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 25037d5258ce..c56a24d42ff2 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.75 2006/02/08 22:58:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.76 2006/02/18 06:16:50 vapier Exp $
+
+  18 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/1.1.0/ppc64-insmod.patch, busybox-1.1.0.ebuild:
+  Fix building on ppc64 #122992 Markus Rothe.
 
   08 Feb 2006; Aron Griffis <agriffis@gentoo.org> busybox-1.01.ebuild:
   Mark 1.01 stable on alpha
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 82cdda2ae168..edd2d5729a77 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 03d7f1bca21fd74b6709b8b026d98c25 ChangeLog 13884
-RMD160 781d60e0eb4ad8566979786b54d346b4c3d860e7 ChangeLog 13884
-SHA256 5928dead9997a9d7ca61438ec6294cc67c3e38428a73ea482f6ecc6bd24fbc3d ChangeLog 13884
+MD5 881125e9b071c0caf3b9f67d70d0ffcd ChangeLog 14036
+RMD160 02ccba4b4b59c04ea20d465c2eb717cd641b9ce6 ChangeLog 14036
+SHA256 4b8157a4b4ff355bf640e5ca3a9cd3475ec333d48f7b1c1d10933a21fb5673de ChangeLog 14036
 MD5 fe2861ddcc79aa407758c05886aee1e0 busybox-1.00-r4.ebuild 7084
 RMD160 758cad996204484b90f30ec3f7a0f1b4bf757818 busybox-1.00-r4.ebuild 7084
 SHA256 d011220b72214515e0d48c97ada66015ad2e0d823c997d6f08423d3323ab8c3a busybox-1.00-r4.ebuild 7084
 MD5 b7b9bf756e20e87cf108d32aed5ec003 busybox-1.01.ebuild 6919
 RMD160 bd9e1a667f120ac65d280308deae200d4227aca6 busybox-1.01.ebuild 6919
 SHA256 a79aa3f0d8ecc4a4545296d1ea5dcfa2bc4d18f98f5f6d2ce68e432dd2b89b96 busybox-1.01.ebuild 6919
-MD5 17fe7a5e75c515e9b95dd419ad90f735 busybox-1.1.0.ebuild 6441
-RMD160 2c6ab0935fea4a10d0477a1177787b51828992ee busybox-1.1.0.ebuild 6441
-SHA256 e6ed33f999fb28f36adb186985555018388ee45b6a8551cc272eca5e2ef48ab3 busybox-1.1.0.ebuild 6441
+MD5 caea38f632a9851cd75471b0f0306436 busybox-1.1.0.ebuild 6488
+RMD160 cf743c09a2a69ba787795bf3418508a1d8ab89f2 busybox-1.1.0.ebuild 6488
+SHA256 39a81a3ba31e00a4e2189743dc9028f39826ab5588a44bd19f362e97f27c2422 busybox-1.1.0.ebuild 6488
 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
 RMD160 01c16591ff5d5b339a605a4372c6e431270862ed files/1.00/bash-tests.patch 1474
 SHA256 091f9aa2a5294cf9659ffaa2c6f995e9af2d0cdc2388ecab3620d06fd4ac4cb2 files/1.00/bash-tests.patch 1474
@@ -52,6 +52,9 @@ SHA256 f1b10d90fdcf0ee370ffb8a760dd3e82d3a6df4e213c03be99ed3803e7460a7d files/1.
 MD5 9a2f1a6d14ff310ef48f55cc4841aa99 files/1.1.0/bb.patch 156
 RMD160 7dea06b8cad20585129845980fe06eb6d27ed159 files/1.1.0/bb.patch 156
 SHA256 094d7a95f64198666ea65bdd59f2ea93b7f489b9019bb045aa1c1d25e9f0ee53 files/1.1.0/bb.patch 156
+MD5 09f8e41306220183f16a668aa9e3cc76 files/1.1.0/ppc64-insmod.patch 359
+RMD160 4f423c216dbe5ba36e2589e51091775b21e398c2 files/1.1.0/ppc64-insmod.patch 359
+SHA256 822f72925dbff554a1f4e8c34a979bf7fc192b5683b62a40f6d78316b80d8a8c files/1.1.0/ppc64-insmod.patch 359
 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853
 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853
@@ -68,9 +71,9 @@ MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
 SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD6nenJrHF4yAQTrARAtBrAKCmvA6Joma1hlj3npNo4fwKSOK/9gCgxECL
-zb5qa6nkOEEzecrjg4K/9yQ=
-=0/pg
+iD8DBQFD9rvd2+ySkm8kpY0RAq0+AKDGU2gK0F5jWEHqZic/44USnMcD4QCguSLp
+DMkog/GkK5UY06FmM9TFRDc=
+=lYiQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.0.ebuild b/sys-apps/busybox/busybox-1.1.0.ebuild
index 3b6552c53522..bba95e8728aa 100644
--- a/sys-apps/busybox/busybox-1.1.0.ebuild
+++ b/sys-apps/busybox/busybox-1.1.0.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/sys-apps/busybox/busybox-1.1.0.ebuild,v 1.2 2006/02/04 17:45:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.0.ebuild,v 1.3 2006/02/18 06:16:50 vapier Exp $
 
 inherit eutils
 
@@ -57,6 +57,7 @@ src_unpack() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/1.1.0/bb.patch
+	epatch "${FILESDIR}"/1.1.0/ppc64-insmod.patch
 
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
diff --git a/sys-apps/busybox/files/1.1.0/ppc64-insmod.patch b/sys-apps/busybox/files/1.1.0/ppc64-insmod.patch
new file mode 100644
index 000000000000..cda3ac61f535
--- /dev/null
+++ b/sys-apps/busybox/files/1.1.0/ppc64-insmod.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/122992
+
+Index: modutils/insmod.c
+===================================================================
+--- modutils/insmod.c	(revision 14108)
++++ modutils/insmod.c	(revision 14109)
+@@ -1297,6 +1297,9 @@
+ 			}
+ 			break;
+ 
++#elif defined(__powerpc64__)
++		/* do this someday ... */
++
+ #elif defined(__powerpc__)
+ 
+ 		case R_PPC_ADDR16_HA: