summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-08-13 21:59:05 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-08-13 21:59:05 +0000
commita3275c1a5b1af5cb9e9dd10d60e60260106cc9a9 (patch)
tree88b87f9cacd6b6bb5c10a359117b70d6169f888b /sys-apps
parentBug #228063 fun time for sys-libs/db:4.7 (diff)
downloadgentoo-2-a3275c1a5b1af5cb9e9dd10d60e60260106cc9a9.tar.gz
gentoo-2-a3275c1a5b1af5cb9e9dd10d60e60260106cc9a9.tar.bz2
gentoo-2-a3275c1a5b1af5cb9e9dd10d60e60260106cc9a9.zip
Bug #233927, compile-fix for PPC, tested on my G5.
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64, RepoMan options: --force)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/busybox/ChangeLog6
-rw-r--r--sys-apps/busybox/busybox-1.11.1.ebuild3
-rw-r--r--sys-apps/busybox/files/busybox-1.11.1-ppc-ifile.patch12
3 files changed, 19 insertions, 2 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/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;