Added a patch for big-endian archs needed to build programs and moved 2.4.21-r2 to mips stable

4 files changed, 62 insertions, 6 deletions

diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index dca3d92417ba..c250e4a1cd8f 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,7 +1,7 @@
-MD5 5aec2aece67ec5d7ba7a9b05abab12b5 ChangeLog 1860
+MD5 2697691b2828796877581b4dfd88029e ChangeLog 1860
 MD5 d8a2dc5304c6154797d4698db0f016c2 mips-headers-2.4.21-r1.ebuild 1305
-MD5 33bd034d458d3e650dbb9d573f5bb601 mips-headers-2.4.21-r2.ebuild 1206
-MD5 eaea4961ead957d0687f7685df20b20c mips-headers-2.4.22-r1.ebuild 1220
+MD5 d4ee1d35805d628d4232193b6c7acab6 mips-headers-2.4.21-r2.ebuild 1203
+MD5 0db8a880d82d3c5843fea05d956ad4e9 mips-headers-2.4.22-r1.ebuild 1217
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
 MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
diff --git a/sys-kernel/mips-headers/files/bigendian-byteorder-fix.patch b/sys-kernel/mips-headers/files/bigendian-byteorder-fix.patch
new file mode 100644
index 000000000000..bec279abce81
--- /dev/null
+++ b/sys-kernel/mips-headers/files/bigendian-byteorder-fix.patch
@@ -0,0 +1,50 @@
+--- linux/include/linux/byteorder/generic.h.orig	2003-08-10 18:15:07.000000000 -0700
++++ linux/include/linux/byteorder/generic.h	2003-08-10 18:16:36.000000000 -0700
+@@ -122,7 +122,7 @@
+ #define be16_to_cpus __be16_to_cpus
+ #endif
+ 
+-
++#if defined(__KERNEL__)
+ /*
+  * Handle ntohl and suches. These have various compatibility
+  * issues - like we want to give the prototype even though we
+@@ -146,35 +146,26 @@
+  * Do the prototypes. Somebody might want to take the
+  * address or some such sick thing..
+  */
+-#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
+ extern __u32			ntohl(__u32);
+ extern __u32			htonl(__u32);
+-#else
+-extern unsigned long int	ntohl(unsigned long int);
+-extern unsigned long int	htonl(unsigned long int);
+-#endif
+ extern unsigned short int	ntohs(unsigned short int);
+ extern unsigned short int	htons(unsigned short int);
+ 
+-
+-#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__) && !defined(__STRICT_ANSI__)
++#if defined(__GNUC__) && defined(__OPTIMIZE__)
+ 
+ #define ___htonl(x) __cpu_to_be32(x)
+ #define ___htons(x) __cpu_to_be16(x)
+ #define ___ntohl(x) __be32_to_cpu(x)
+ #define ___ntohs(x) __be16_to_cpu(x)
+ 
+-#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
+ #define htonl(x) ___htonl(x)
+ #define ntohl(x) ___ntohl(x)
+-#else
+-#define htonl(x) ((unsigned long)___htonl(x))
+-#define ntohl(x) ((unsigned long)___ntohl(x))
+-#endif
+ #define htons(x) ___htons(x)
+ #define ntohs(x) ___ntohs(x)
+ 
+ #endif /* OPTIMIZE */
+ 
++#endif /* KERNEL */
++
+ 
+ #endif /* _LINUX_BYTEORDER_GENERIC_H */
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
index 1f0ac8daad84..78a8586688ee 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild,v 1.3 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild,v 1.4 2003/09/16 02:13:17 kumba Exp $
 
 
 ETYPE="headers"
@@ -22,7 +22,7 @@ DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
 HOMEPAGE="http://www.linux-mips.org/"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 SLOT="${OKV}"
 
 src_unpack() {
@@ -32,6 +32,9 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
 
+	# Big Endian Fix
+	cat ${FILESDIR}/bigendian-byteorder-fix.patch | patch -p1
+
 	# Patch arch/mips/Makefile for gcc
 	cat ${FILESDIR}/mips-patches-gcc-makefile-fix.patch | patch -p0
 
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
index cc6539162ca6..11162cfe9c56 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild,v 1.2 2003/09/07 07:26:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild,v 1.3 2003/09/16 02:13:17 kumba Exp $
 
 
 ETYPE="headers"
@@ -32,6 +32,9 @@ src_unpack() {
 	# Update the vanilla sources with linux-mips CVS changes
 	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
 
+	# Big Endian Fix
+	cat ${FILESDIR}/bigendian-byteorder-fix.patch | patch -p1
+
 	# Patch arch/mips/Makefile for gcc
 	cat ${FILESDIR}/mipscvs-${OKV}-${CVSDATE}-makefile-fix.patch | patch -p0