diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-08-06 16:12:50 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-08-06 16:12:50 +0000 |
| commit | 0d29c825960865f7dfe027bf9944bba0cee0de4b (patch) | |
| tree | 8b96738d32476e9f10302cb9917b5f71ab127331 /dev-libs | |
| parent | Keyworded ~sparc (Manifest recommit) (diff) | |
| download | gentoo-2-0d29c825960865f7dfe027bf9944bba0cee0de4b.tar.gz gentoo-2-0d29c825960865f7dfe027bf9944bba0cee0de4b.tar.bz2 gentoo-2-0d29c825960865f7dfe027bf9944bba0cee0de4b.zip | |
fix arm / ldconfig / etc...
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/uclibc/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/uclibc/files/0.9.26/arm-ucontext.patch | 10 | ||||
| -rw-r--r-- | dev-libs/uclibc/uclibc-0.9.26-r4.ebuild | 22 |
3 files changed, 30 insertions, 9 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/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() { |