Added ~sparc-fbsd keyword.

(Portage version: 2.1.2_pre3-r3)

3 files changed, 44 insertions, 4 deletions

diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 7212c86ef093..2d9f2dc6a336 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.13 2006/10/05 09:10:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.14 2006/10/17 10:20:18 uberlord Exp $
+
+  17 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-libexec-6.2-sparc64.patch,
+  freebsd-libexec-6.2_beta2.ebuild:
+  Added ~sparc-fbsd keyword.
 
 *freebsd-libexec-6.2_beta2 (05 Oct 2006)
 
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-6.2-sparc64.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-6.2-sparc64.patch
new file mode 100644
index 000000000000..3ed300a45863
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-6.2-sparc64.patch
@@ -0,0 +1,34 @@
+FreeBSD only works on Sparc64 and freeBSD code relies on the __sparc64__ define.
+gcc only defines __sparc64__ if -mcpu is not used.
+gcc-4 defaults to using -mcpu=ultrasparc on FreeBSD.
+
+This causes us a problem. Infact, FreeBSD developers sent gcc a patch to always
+define __sparc64__ when using -mcpu=ultrasparc, but this was rejected by most
+people including NetBSD developers.
+
+The correct solution is to use __sparc__.
+If platform detection is required, or the code is obviously 64 bit then we can
+use the __arch64__ define as well.
+This combination should be supported by all gcc versions:)
+
+diff -ur libexec.orig/rtld-elf/rtld.c libexec/rtld-elf/rtld.c
+--- libexec.orig/rtld-elf/rtld.c	2006-10-10 08:16:56 +0100
++++ libexec/rtld-elf/rtld.c	2006-10-10 08:19:08 +0100
+@@ -2732,7 +2732,7 @@
+ 
+ #endif
+ 
+-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \
++#if defined(__i386__) || defined(__amd64__) || defined(__sparc__) || \
+     defined(__arm__)
+ 
+ /*
+@@ -2897,7 +2897,7 @@
+ void
+ free_tls_offset(Obj_Entry *obj)
+ {
+-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \
++#if defined(__i386__) || defined(__amd64__) || defined(__sparc__) || \
+     defined(__arm__)
+     /*
+      * If we were the last thing to allocate out of the static TLS
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild
index 2cd6b4635109..23c1140f2820 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild,v 1.1 2006/10/05 09:10:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild,v 1.2 2006/10/17 10:20:18 uberlord Exp $
 
 inherit bsdmk freebsd pam
 
 DESCRIPTION="FreeBSD libexec things"
 SLOT="0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
 
 IUSE="pam ssl kerberos ipv6 nis"
 
@@ -45,7 +45,8 @@ src_compile() {
 PATCHES="${FILESDIR}/${PN}-setXid.patch
 	${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch
 	${FILESDIR}/${PN}-nossp.patch
-	${FILESDIR}/${PN}-6.1-libfallback.patch"
+	${FILESDIR}/${PN}-6.1-libfallback.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
 
 # Remove sendmail, tcp_wrapper and other useless stuff
 REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"