From 4cde60d77e60586f8cd5b726a610d77ce3bcc95d Mon Sep 17 00:00:00 2001
From: Joshua Kinard <kumba@gentoo.org>
Date: Sun, 18 Sep 2005 06:40:04 +0000
Subject: [PATCH] Added a patch to allow klibc to build properly on mips
 systems w/ 64bit kernel/32bit userland, and marked 1.1 ~mips.
 Package-Manager: portage-2.0.51.22-r2

---
 dev-libs/klibc/ChangeLog                    |  7 ++++++-
 dev-libs/klibc/Manifest                     | 21 ++++++---------------
 dev-libs/klibc/files/klibc-1.1-mips32.patch | 12 ++++++++++++
 dev-libs/klibc/klibc-1.1.ebuild             |  8 ++++++--
 4 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 dev-libs/klibc/files/klibc-1.1-mips32.patch

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index d509f182ae2a..d0c134644425 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.11 2005/09/02 14:38:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.12 2005/09/18 06:40:04 kumba Exp $
+
+  18 Sep 2005; Joshua Kinard <kumba@gentoo.org> +files/klibc-1.1-mips32.patch,
+  klibc-1.1.ebuild:
+  Added a patch to allow klibc to build properly on mips systems w/ 64bit
+  kernel/32bit userland, and marked 1.1 ~mips.
 
 *klibc-1.1 (02 Sep 2005)
 
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index b668a94d66b1..458fb87ac2c5 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ad721da9333849a83749d535f58388f3 klibc-1.1.ebuild 4024
-MD5 87eac36868c96b295f5b4b631a505db9 klibc-1.0.14-r1.ebuild 4123
-MD5 d7718105e4e255372e421c6afa93b212 ChangeLog 1933
+MD5 8c66572e6e1a1c017b08906a60885765 ChangeLog 2153
+MD5 5f4c01a766e34277b29d62ac76e4ac81 klibc-1.1.ebuild 4166
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
+MD5 87eac36868c96b295f5b4b631a505db9 klibc-1.0.14-r1.ebuild 4123
+MD5 9f7934fa62dac32c7a1f7fb7f3c1eff6 files/digest-klibc-1.1 62
+MD5 d771e07746a2d5b2bdac366cd992c885 files/klibc-1.1-mips32.patch 670
 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619
-MD5 4b098438d57b0f7ad9f16d534fb98eb4 files/klibc-1.0.14-nostdlib.patch 460
 MD5 5f74818fe6743d6f26cd199480a6d4ea files/digest-klibc-1.0.14-r1 65
-MD5 9f7934fa62dac32c7a1f7fb7f3c1eff6 files/digest-klibc-1.1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGGWh1ZcsMnZjRyIRAqECAJ9SaUMYfhg3jyB8hrs0f9yJWjM8AQCfc1nu
-Hu/fGkcizKDhfMsHRHYHLw0=
-=0HuF
------END PGP SIGNATURE-----
+MD5 4b098438d57b0f7ad9f16d534fb98eb4 files/klibc-1.0.14-nostdlib.patch 460
diff --git a/dev-libs/klibc/files/klibc-1.1-mips32.patch b/dev-libs/klibc/files/klibc-1.1-mips32.patch
new file mode 100644
index 000000000000..8eaf5d136801
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.1-mips32.patch
@@ -0,0 +1,12 @@
+diff -Naurp klibc-1.1.orig/MCONFIG klibc-1.1/MCONFIG
+--- klibc-1.1.orig/MCONFIG	2005-09-20 02:16:17 -0400
++++ klibc-1.1/MCONFIG	2005-09-20 02:16:57 -0400
+@@ -33,7 +33,7 @@ KRNLOBJ = $(SRCROOT)/linux
+ KLIBCVER = -D__KLIBC__=$(shell cut -d. -f1 < $(SRCROOT)/version) \
+ 	   -D__KLIBC_MINOR__=$(shell cut -d. -f2 < $(SRCROOT)/version)
+ 
+-ARCH    = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/)
++ARCH    = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/ -e s/mips64/mips/)
+ CC	= $(CROSS)gcc
+ LD      = $(CROSS)ld
+ KLIBSRC = $(SRCROOT)/klibc
diff --git a/dev-libs/klibc/klibc-1.1.ebuild b/dev-libs/klibc/klibc-1.1.ebuild
index 03f8241b4de8..73440a6295e4 100644
--- a/dev-libs/klibc/klibc-1.1.ebuild
+++ b/dev-libs/klibc/klibc-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.ebuild,v 1.1 2005/09/02 14:38:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.1.ebuild,v 1.2 2005/09/18 06:40: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"
+KEYWORDS="~amd64 ~ppc ~x86 ~mips"
 IUSE=""
 RESTRICT="nostrip"
 
@@ -96,6 +96,10 @@ src_unpack() {
 	cat > "${S}/70klibc" <<-EOF
 		PRELINK_PATH_MASK="/usr/lib/klibc"
 	EOF
+
+	# klibc detects mips64 systems as having 64bit userland
+	# Force them to 32bit userlands instead
+	epatch ${FILESDIR}/${P}-mips32.patch
 }
 
 src_compile() {
-- 
2.26.2