summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-08-09 19:09:58 +0000
committerMike Frysinger <vapier@gentoo.org>2004-08-09 19:09:58 +0000
commitb60a4fe406bde3d8ec5f9603e7ced080a8253bff (patch)
treec550ad395cb22c1bf0f36292a5a4ae95762b438d /dev-libs
parentMarked ~amd64, bug 55845 (Manifest recommit) (diff)
downloadgentoo-2-b60a4fe406bde3d8ec5f9603e7ced080a8253bff.tar.gz
gentoo-2-b60a4fe406bde3d8ec5f9603e7ced080a8253bff.tar.bz2
gentoo-2-b60a4fe406bde3d8ec5f9603e7ced080a8253bff.zip
fix ld.so.cache problems
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/uclibc/ChangeLog6
-rw-r--r--dev-libs/uclibc/files/0.9.26/uclibc-0.9.26-ldso-cache.patch10
-rw-r--r--dev-libs/uclibc/uclibc-0.9.26-r5.ebuild5
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-libs/uclibc/ChangeLog b/dev-libs/uclibc/ChangeLog
index f934263949bd..f67965daa8b8 100644
--- a/dev-libs/uclibc/ChangeLog
+++ b/dev-libs/uclibc/ChangeLog
@@ -1,6 +1,10 @@
# 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.32 2004/08/09 14:42:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.33 2004/08/09 19:09:58 vapier Exp $
+
+ 09 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+ +files/0.9.26/uclibc-0.9.26-ldso-cache.patch, uclibc-0.9.26-r5.ebuild:
+ Add a small patch to allow loading of ELF_LIBC0 libraries.
09 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+files/0.9.26/uclibc-0.9.26-resolve-segfault.patch, uclibc-0.9.26-r5.ebuild:
diff --git a/dev-libs/uclibc/files/0.9.26/uclibc-0.9.26-ldso-cache.patch b/dev-libs/uclibc/files/0.9.26/uclibc-0.9.26-ldso-cache.patch
new file mode 100644
index 000000000000..40867d15152b
--- /dev/null
+++ b/dev-libs/uclibc/files/0.9.26/uclibc-0.9.26-ldso-cache.patch
@@ -0,0 +1,10 @@
+--- ldso/ldso/dl-elf.c.orig 2004-08-09 19:01:02 +0000
++++ ldso/ldso/dl-elf.c 2004-08-09 19:00:40 +0000
+@@ -329,6 +329,7 @@
+ #endif
+ for (i = 0; i < header->nlibs; i++) {
+ if ((libent[i].flags == LIB_ELF ||
++ libent[i].flags == LIB_ELF_LIBC0 ||
+ libent[i].flags == LIB_ELF_LIBC5) &&
+ _dl_strcmp(libname, strs + libent[i].sooffset) == 0 &&
+ (tpnt1 = _dl_load_elf_shared_library(secure,
diff --git a/dev-libs/uclibc/uclibc-0.9.26-r5.ebuild b/dev-libs/uclibc/uclibc-0.9.26-r5.ebuild
index d8db3053180a..20f98f09a75a 100644
--- a/dev-libs/uclibc/uclibc-0.9.26-r5.ebuild
+++ b/dev-libs/uclibc/uclibc-0.9.26-r5.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-r5.ebuild,v 1.3 2004/08/09 16:01:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r5.ebuild,v 1.4 2004/08/09 19:09:58 vapier Exp $
inherit eutils flag-o-matic gcc
@@ -87,6 +87,9 @@ src_unpack() {
# fix segfaults when running things like `emerge sync`
epatch ${FILESDIR}/${PV}/${PN}-${PV}-resolve-segfault.patch
+ # allow libs tagged as ELF_LIBC0 in the cache to be loaded
+ epatch ${FILESDIR}/${PV}/${PN}-${PV}-ldso-cache.patch
+
# fixup for install perms
sed -i -e "s:-fa:-dRf:g" Makefile