summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-18 06:16:50 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-18 06:16:50 +0000
commitabfab129288c2ba974c7291e7e4fe6ac09a0928b (patch)
tree0e5227348930598e0022b8bbe5d2590ca17d4b04 /sys-apps/busybox
parentadding ~ppc (diff)
downloadgentoo-2-abfab129288c2ba974c7291e7e4fe6ac09a0928b.tar.gz
gentoo-2-abfab129288c2ba974c7291e7e4fe6ac09a0928b.tar.bz2
gentoo-2-abfab129288c2ba974c7291e7e4fe6ac09a0928b.zip
Fix building on ppc64 #122992 Markus Rothe.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'sys-apps/busybox')
-rw-r--r--sys-apps/busybox/ChangeLog6
-rw-r--r--sys-apps/busybox/busybox-1.1.0.ebuild3
-rw-r--r--sys-apps/busybox/files/1.1.0/ppc64-insmod.patch16
3 files changed, 23 insertions, 2 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/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: