Added patch for ARCH=arm to prevent a static inlines from being included more than one time. sent patch upstream

4 files changed, 37 insertions, 5 deletions

diff --git a/dev-libs/uclibc/ChangeLog b/dev-libs/uclibc/ChangeLog
index bf302d73d0b8..03b7dcfe87d3 100644
--- a/dev-libs/uclibc/ChangeLog
+++ b/dev-libs/uclibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/uclibc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.21 2004/06/23 02:14:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.22 2004/06/23 18:28:49 solar Exp $
+
+*uclibc-0.9.26-r2 (23 Jun 2004)
+
+  23 Jun 2004; <solar@gentoo.org> uclibc-0.9.26-r2.ebuild,
+  files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch:
+  Added patch for ARCH=arm to prevent a static inlines from being included more
+  than one time. sent patch upstream
 
   22 Jun 2004; <solar@gentoo.org> files/0.9.26/ssp.c,
   files/0.9.26/uClibc-20040613-do_rem.patch,
diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest
index f0eb5c2457be..2963427e3b0e 100644
--- a/dev-libs/uclibc/Manifest
+++ b/dev-libs/uclibc/Manifest
@@ -1,6 +1,6 @@
-MD5 89b7c6b10681b01108edcdd5700fab8b uclibc-0.9.26-r2.ebuild 6124
+MD5 0f09e214b55018acde32b82559bb4236 uclibc-0.9.26-r2.ebuild 6190
 MD5 3783c027ae7ce204176e87ec250a59f3 uclibc-0.9.26-r1.ebuild 2550
-MD5 6e3b0e9602c06e204c8bdbf07a94f748 ChangeLog 4434
+MD5 94bbd5bdc29dd14de8a9eec6675b16a7 ChangeLog 4694
 MD5 5e376ebb178aae5f2f7b29da2b0b7917 uclibc-0.9.21.ebuild 1082
 MD5 f694d40cf09e6c5511ae52f755a5ffe5 metadata.xml 998
 MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897
@@ -16,3 +16,4 @@ MD5 874260fc77637deccf7588cfc1c76674 files/0.9.26/uClibc-20040613-do_rem.patch 3
 MD5 d35beaf332590fed8c619483d4598dc6 files/0.9.26/uclibc-0.9.26-ssp-gcc34-after-frandom.patch 542
 MD5 bdd1e91ee48fb8be0d28cabdfcfdf3ff files/0.9.26/uClibc-0.9.26-pie-option.patch 863
 MD5 2416f5e954ccb8b39b1c0d6a3cf5e827 files/0.9.26/uClibc-0.9.26-Makefile.patch 1478
+MD5 b9df87c681aa3a1ef3033cb195e516df files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795
diff --git a/dev-libs/uclibc/files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch b/dev-libs/uclibc/files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch
new file mode 100644
index 000000000000..a1b50c0aa5aa
--- /dev/null
+++ b/dev-libs/uclibc/files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch
@@ -0,0 +1,23 @@
+Index: ldso/ldso/arm/dl-sysdep.h
+===================================================================
+RCS file: /var/cvs/uClibc/ldso/ldso/arm/dl-sysdep.h,v
+retrieving revision 1.9
+diff -u -b -B -w -p -r1.9 dl-sysdep.h
+--- ldso/ldso/arm/dl-sysdep.h	17 Feb 2004 10:55:54 -0000	1.9
++++ ldso/ldso/arm/dl-sysdep.h	23 Jun 2004 17:57:35 -0000
+@@ -5,6 +5,9 @@
+  * Copyright (C) 2000-2004 by Erik Andersen <andersen@codpoet.org>
+  */
+ 
++#ifndef __DL_SYSDEP_H__
++#define __DL_SYSDEP_H__
++
+ /* Define this if the system uses RELOCA.  */
+ #undef ELF_USES_RELOCA
+ 
+@@ -66,3 +69,5 @@ unsigned long _dl_linux_resolver(struct 
+ #define elf_machine_type_class(type) \
+   ((((type) == R_ARM_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT)	\
+    | (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY))
++
++#endif /* __DL_SYSDEP_H__ */
diff --git a/dev-libs/uclibc/uclibc-0.9.26-r2.ebuild b/dev-libs/uclibc/uclibc-0.9.26-r2.ebuild
index 07f4e32fd071..06df89832a85 100644
--- a/dev-libs/uclibc/uclibc-0.9.26-r2.ebuild
+++ b/dev-libs/uclibc/uclibc-0.9.26-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r2.ebuild,v 1.1 2004/06/23 02:14:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r2.ebuild,v 1.2 2004/06/23 18:28:49 solar Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -71,7 +71,8 @@ src_unpack() {
 	fi
 
 	# support archs which dont implement all syscalls
-	[ -z "${CVS_VER}" ] && epatch ${FILESDIR}/${PV}/arm-fix-missing-syscalls.patch
+	[ -z "${CVS_VER}" ] && epatch ${FILESDIR}/${PV}/arm-fix-missing-syscalls.patch || \
+		epatch ${FILESDIR}/${PV}/uclibc-0.9.26-arm-dl-sysdep.patch
 
 	# fixup for install perms
 	sed -i -e "s:-fa:-dRf:g" Makefile