summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-09-20 15:11:56 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-09-20 15:11:56 +0000
commitbb73cee0efb76c1527832aa0904fd59fe0ec1444 (patch)
tree6c2d814e61b3351ff429ee101566ceff73209dc5 /sys-apps
parentStable on x86 (GLSA bug #64643) (Manifest recommit) (diff)
downloadgentoo-2-bb73cee0efb76c1527832aa0904fd59fe0ec1444.tar.gz
gentoo-2-bb73cee0efb76c1527832aa0904fd59fe0ec1444.tar.bz2
gentoo-2-bb73cee0efb76c1527832aa0904fd59fe0ec1444.zip
Added missing amd64 patch.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/busybox/ChangeLog6
-rw-r--r--sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch22
2 files changed, 27 insertions, 1 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index a66beb218624..27dded668bde 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/busybox
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.43 2004/09/17 00:06:33 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.44 2004/09/20 15:11:56 eradicator Exp $
+
+ 20 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/busybox-1.00_rc3-amd64.patch:
+ Added missing amd64 patch.
16 Sep 2004; <solar@gentoo.org> busybox-1.00_rc3.ebuild:
marked busybox-1.00-rc3 stable for x86, other arches please follow so it can
diff --git a/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch b/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch
new file mode 100644
index 000000000000..d596f5815273
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.00_rc3-amd64.patch
@@ -0,0 +1,22 @@
+diff -Naur busybox-1.00-rc3.orig/modutils/insmod.c busybox-1.00-rc3/modutils/insmod.c
+--- busybox-1.00-rc3.orig/modutils/insmod.c 2004-07-20 08:43:57.000000000 -0700
++++ busybox-1.00-rc3/modutils/insmod.c 2004-09-20 07:47:17.818776178 -0700
+@@ -148,6 +148,18 @@
+ #define ELFCLASSM ELFCLASS32
+ #endif
+
++#if defined(__x86_64__)
++#define BB_USE_GOT_ENTRIES
++#define BB_GOT_ENTRY_SIZE 8
++#define BB_USE_SINGLE
++
++#define MATCH_MACHINE(x) (x == EM_X86_64)
++
++#define SHT_RELM SHT_RELA
++#define Elf64_RelM Elf64_Rela
++#define ELFCLASSM ELFCLASS64
++#endif
++
+ #if defined(__mc68000__)
+ #define CONFIG_USE_GOT_ENTRIES
+ #define CONFIG_GOT_ENTRY_SIZE 4