fix arm / ldconfig / etc...

4 files changed, 36 insertions, 14 deletions

diff --git a/dev-libs/uclibc/ChangeLog b/dev-libs/uclibc/ChangeLog
index 86ece802df09..c84e39d05dbe 100644
--- a/dev-libs/uclibc/ChangeLog
+++ b/dev-libs/uclibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/uclibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.29 2004/07/30 17:10:55 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.30 2004/08/06 16:12:50 vapier Exp $
+
+  06 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/0.9.26/arm-ucontext.patch, uclibc-0.9.26-r4.ebuild:
+  Make sure arm/ucontext.h includes the right context files and fix the ld utils
+  to properly read/write /etc/ld.so.* files.
 
 *uclibc-0.9.26-r4 (30 Jul 2004)
 
diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest
index b4e24fdb6b4c..899571a114e0 100644
--- a/dev-libs/uclibc/Manifest
+++ b/dev-libs/uclibc/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 df30437d535c6515a7560c3ceed1c8a3 ChangeLog 5696
+MD5 e8e984b62cd7fb03bda81354e5c8bee7 ChangeLog 5935
 MD5 f694d40cf09e6c5511ae52f755a5ffe5 metadata.xml 998
 MD5 7fde305dfd21aeac12e0eb721e0f6a17 uclibc-0.9.21.ebuild 1096
 MD5 648448f5b143b6002812f0fb0a78c683 uclibc-0.9.26-r1.ebuild 2555
 MD5 ebf20118b3d6ced339721338685d97b0 uclibc-0.9.26-r2.ebuild 6191
 MD5 03b8de2ae5acc3aa78d72abe3f8edd7b uclibc-0.9.26-r3.ebuild 6337
-MD5 72c8efb65b309e53f48d5d3f0744e61e uclibc-0.9.26-r4.ebuild 7011
+MD5 4721ec10428a08b2c41bf41dc235fb21 uclibc-0.9.26-r4.ebuild 7174
 MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897
 MD5 799adc7fb6ec9ffd653831cea1d32dd5 files/digest-uclibc-0.9.21 67
 MD5 02ffb023d5b3be46c7e0c9aadf48d304 files/digest-uclibc-0.9.26-r2 231
@@ -26,10 +26,11 @@ MD5 874260fc77637deccf7588cfc1c76674 files/0.9.26/uClibc-20040613-do_rem.patch 3
 MD5 b9df87c681aa3a1ef3033cb195e516df files/0.9.26/uclibc-0.9.26-arm-dl-sysdep.patch 795
 MD5 d35beaf332590fed8c619483d4598dc6 files/0.9.26/uclibc-0.9.26-ssp-gcc34-after-frandom.patch 542
 MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
+MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.8 (GNU/Linux)
 
-iD8DBQFBCqRhHTu7gpaalycRAoKNAJsEfdkw6fKIik1dYrbi30f6+VA1/wCfd1pl
-Co/7WkCo34wc9ZfzGpuf1mU=
-=sxox
+iD8DBQFBE66dHTu7gpaalycRAnaAAKDrYqwg753pTrAmwkrFPOo1ttXXDgCeJat2
+lbw9C1BGMLS7KxZXzkQ8+es=
+=TXSP
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/uclibc/files/0.9.26/arm-ucontext.patch b/dev-libs/uclibc/files/0.9.26/arm-ucontext.patch
new file mode 100644
index 000000000000..78b8d4cc04e4
--- /dev/null
+++ b/dev-libs/uclibc/files/0.9.26/arm-ucontext.patch
@@ -0,0 +1,10 @@
+--- libc/sysdeps/linux/arm/sys/ucontext.h.orig	2004-08-06 12:08:48.234295048 -0400
++++ libc/sysdeps/linux/arm/sys/ucontext.h	2004-08-06 12:09:11.123815312 -0400
+@@ -24,6 +24,7 @@
+ #include <features.h>
+ #include <signal.h>
+ #include <sys/procfs.h>
++#include <bits/sigcontext.h>
+ 
+ typedef int greg_t;
+ 
diff --git a/dev-libs/uclibc/uclibc-0.9.26-r4.ebuild b/dev-libs/uclibc/uclibc-0.9.26-r4.ebuild
index 2b7be6414534..9b16007b3ef7 100644
--- a/dev-libs/uclibc/uclibc-0.9.26-r4.ebuild
+++ b/dev-libs/uclibc/uclibc-0.9.26-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r4.ebuild,v 1.2 2004/07/30 19:40:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r4.ebuild,v 1.3 2004/08/06 16:12:50 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -72,8 +72,10 @@ src_unpack() {
 	fi
 
 	# support archs which dont implement all syscalls
-	[ -z "${CVS_VER}" ] && epatch ${FILESDIR}/${PV}/arm-fix-missing-syscalls.patch || \
-		epatch ${FILESDIR}/${PV}/uclibc-0.9.26-arm-dl-sysdep.patch
+	[ -z "${CVS_VER}" ] \
+		&& epatch ${FILESDIR}/${PV}/arm-fix-missing-syscalls.patch \
+		|| epatch ${FILESDIR}/${PV}/uclibc-0.9.26-arm-dl-sysdep.patch
+	epatch ${FILESDIR}/${PV}/arm-ucontext.patch
 
 	# build all .S files w/ -Wa,--noexecstack
 	if [ "0${CVS_VER}" -ge "20040730" ]; then
@@ -150,11 +152,13 @@ src_unpack() {
 	sed -i -e 's:KERNEL_SOURCE.*:KERNEL_SOURCE="/usr":' .config
 
 	check_main_libc
-	if [ "${SYS_LIBC}" = "uClibc" ]
-	then
-		sed -i -e 's:SHARED_LIB_LOADER_PREFIX=.*:SHARED_LIB_LOADER_PREFIX="/lib":' .config
-		sed -i -e 's:DEVEL_PREFIX=.*:DEVEL_PREFIX="/usr":' .config
-		sed -i -e 's:RUNTIME_PREFIX=.*:RUNTIME_PREFIX="/":' .config
+	if [ "${SYS_LIBC}" = "uClibc" ] ; then
+		sed -i \
+			-e 's:SHARED_LIB_LOADER_PREFIX=.*:SHARED_LIB_LOADER_PREFIX="/lib":' \
+			-e 's:DEVEL_PREFIX=.*:DEVEL_PREFIX="/usr":' \
+			-e 's:RUNTIME_PREFIX=.*:RUNTIME_PREFIX="/":' \
+			.config
+		sed -i '/LIBRARY_CACHE:=/s:#::' Rules.mak
 	fi
 
 	make -s oldconfig > /dev/null || die "could not make oldconfig"
@@ -164,6 +168,8 @@ src_unpack() {
 	cp .config myconfig
 
 	emake clean >/dev/null || die "could not clean"
+
+	sed -i 's:\$(R_PREFIX):\\"$(RUNTIME_PREFIX)\\" $(LIBRARY_CACHE):' utils/Makefile
 }
 
 src_compile() {