Build fixes for mips - force 32bit build on mips64 systems if not using n32 and fix a linker path bug for mips.

(Portage version: 2.1_pre3-r1)

7 files changed, 47 insertions, 23 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index ce56ff76c000..a3893f704c06 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.17 2006/01/22 00:14:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.18 2006/01/22 01:30:04 kumba Exp $
+
+  26 Jan 2006; Joshua Kinard <kumba@gentoo.org>
+  +files/klibc-1.1.16-mips-ldpaths.patch, +files/klibc-1.1.16-mips32.patch,
+  klibc-1.1.1.ebuild, klibc-1.1.16.ebuild, klibc-1.1.16-r1.ebuild:
+  Build fixes for mips - force 32bit build on mips64 systems if not using n32
+  and fix a linker path bug for mips.
 
 *klibc-1.1.16-r1 (22 Jan 2006)
 
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 5e29c72806ed..f4eaf5fd3fef 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d1405d35f8d27cdff1bf1de46d9902f0 ChangeLog 2736
+MD5 b0fe291ee8cd6964603dda5b5bce5ca2 ChangeLog 3044
 MD5 5f74818fe6743d6f26cd199480a6d4ea files/digest-klibc-1.0.14-r1 65
 MD5 9f7934fa62dac32c7a1f7fb7f3c1eff6 files/digest-klibc-1.1 62
 MD5 40dd929bc6cde977c4e309596afcd6fe files/digest-klibc-1.1.1 64
@@ -9,17 +6,12 @@ MD5 0e893c37516ea180bbbdcb60081bbec8 files/digest-klibc-1.1.16 65
 MD5 0e893c37516ea180bbbdcb60081bbec8 files/digest-klibc-1.1.16-r1 65
 MD5 4b098438d57b0f7ad9f16d534fb98eb4 files/klibc-1.0.14-nostdlib.patch 460
 MD5 d771e07746a2d5b2bdac366cd992c885 files/klibc-1.1-mips32.patch 670
+MD5 25555d8cb9cd5bca679f411b73a0d6f8 files/klibc-1.1.16-mips-ldpaths.patch 441
+MD5 bc6971ccb91f090d38a5490d630d8973 files/klibc-1.1.16-mips32.patch 711
 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619
 MD5 87eac36868c96b295f5b4b631a505db9 klibc-1.0.14-r1.ebuild 4123
-MD5 b6ca70e7577c32b484f33e067d12cd94 klibc-1.1.1.ebuild 4174
-MD5 ffb1dea6d4f5d05b460fe514871cea70 klibc-1.1.16-r1.ebuild 4135
-MD5 27bd12955ef0d8dca931558bab66708f klibc-1.1.16.ebuild 4088
+MD5 5e4b7ca18f4fa2fd614379b3e6145e48 klibc-1.1.1.ebuild 4173
+MD5 539a59c12ac8694a60f384a0636187d0 klibc-1.1.16-r1.ebuild 4241
+MD5 f7a522889faae7995c4d50906a738335 klibc-1.1.16.ebuild 4082
 MD5 8aeec3288335b9aa00b16bf2c0ae45b6 klibc-1.1.ebuild 4165
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0s6P1ZcsMnZjRyIRAmEmAKCttqpGS/Q8JGFboil1H8qe1OrpvwCePWOr
-Za9Ppv5EENm//hdYDvZhLiU=
-=X7uk
------END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/files/klibc-1.1.16-mips-ldpaths.patch b/dev-libs/klibc/files/klibc-1.1.16-mips-ldpaths.patch
new file mode 100644
index 000000000000..0295cfee55fb
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.1.16-mips-ldpaths.patch
@@ -0,0 +1,9 @@
+diff -Naurp klibc-1.1.16.orig/klibc/arch/mips/MCONFIG klibc-1.1.16/klibc/arch/mips/MCONFIG
+--- klibc-1.1.16.orig/klibc/arch/mips/MCONFIG	2006-01-06 01:11:43 -0500
++++ klibc-1.1.16/klibc/arch/mips/MCONFIG	2006-01-26 04:24:46 -0500
+@@ -12,4 +12,4 @@ OPTFLAGS     = -Os
+ BITSIZE      = 32
+ 
+ # Extra linkflags when building the shared version of the library
+-SHAREDFLAGS	= -T arch/$(ARCH)/klibc.ld
++SHAREDFLAGS	= -T klibc/arch/$(ARCH)/klibc.ld
diff --git a/dev-libs/klibc/files/klibc-1.1.16-mips32.patch b/dev-libs/klibc/files/klibc-1.1.16-mips32.patch
new file mode 100644
index 000000000000..1e3ac5596637
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.1.16-mips32.patch
@@ -0,0 +1,12 @@
+diff -Naurp klibc-1.1.16.orig/Makefile klibc-1.1.16/Makefile
+--- klibc-1.1.16.orig/Makefile	2006-01-06 01:11:43 -0500
++++ klibc-1.1.16/Makefile	2006-01-26 04:24:02 -0500
+@@ -14,7 +14,7 @@ include scripts/Kbuild.include
+ export CC      := gcc
+ NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+ 
+-export ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
++export ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/mips64/mips/)
+ 
+ export HOSTCC     := gcc
+ export HOSTCFLAGS := -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
diff --git a/dev-libs/klibc/klibc-1.1.1.ebuild b/dev-libs/klibc/klibc-1.1.1.ebuild
index 9068c9c3e886..037e9c68135c 100644
--- a/dev-libs/klibc/klibc-1.1.1.ebuild
+++ b/dev-libs/klibc/klibc-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.1.ebuild,v 1.1 2005/11/10 11:55:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.1.ebuild,v 1.2 2006/01/22 01:30:04 kumba Exp $
 
 inherit eutils linux-mod
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/${P}.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2"
 LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 ~ppc ~x86 ~mips"
+KEYWORDS="~amd64 mips ~ppc ~x86"
 IUSE=""
 RESTRICT="nostrip"
 
diff --git a/dev-libs/klibc/klibc-1.1.16-r1.ebuild b/dev-libs/klibc/klibc-1.1.16-r1.ebuild
index 504a2acde2dd..c0627813a706 100644
--- a/dev-libs/klibc/klibc-1.1.16-r1.ebuild
+++ b/dev-libs/klibc/klibc-1.1.16-r1.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/dev-libs/klibc/klibc-1.1.16-r1.ebuild,v 1.1 2006/01/22 00:14:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.16-r1.ebuild,v 1.2 2006/01/22 01:30:04 kumba Exp $
 
 inherit eutils linux-mod
 
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2"
 LICENSE="|| ( GPL-2 LGPL-2 )"
 KEYWORDS="~amd64 ~mips ppc ~x86"
-IUSE=""
+IUSE="n32"
 RESTRICT="nostrip"
 
 DEPEND="dev-lang/perl
@@ -99,7 +99,12 @@ src_unpack() {
 
 	# klibc detects mips64 systems as having 64bit userland
 	# Force them to 32bit userlands instead
-	#epatch ${FILESDIR}/${PN}-1.1-mips32.patch
+	if ! use n32; then
+		epatch ${FILESDIR}/${PN}-1.1.16-mips32.patch
+	fi
+
+	# Linker path is awry
+	epatch ${FILESDIR}/${PN}-1.1.16-mips-ldpaths.patch
 }
 
 src_compile() {
diff --git a/dev-libs/klibc/klibc-1.1.16.ebuild b/dev-libs/klibc/klibc-1.1.16.ebuild
index ac3d8674371e..2b22a77cbe77 100644
--- a/dev-libs/klibc/klibc-1.1.16.ebuild
+++ b/dev-libs/klibc/klibc-1.1.16.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/dev-libs/klibc/klibc-1.1.16.ebuild,v 1.2 2006/01/21 20:59:54 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.16.ebuild,v 1.3 2006/01/22 01:30:04 kumba Exp $
 
 inherit eutils linux-mod
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/${P}.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2"
 LICENSE="|| ( GPL-2 LGPL-2 )"
-KEYWORDS="~amd64 ~mips ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""
 RESTRICT="nostrip"