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
commitc2d48a145db081c274886789aed01a93078f0d72 (patch)
tree15d146bdd86d6fe25389ea388a0fc0f3f692a483 /dev-libs
parentMarked ~amd64, bug 55845 (diff)
downloadhistorical-c2d48a145db081c274886789aed01a93078f0d72.tar.gz
historical-c2d48a145db081c274886789aed01a93078f0d72.tar.bz2
historical-c2d48a145db081c274886789aed01a93078f0d72.zip
fix ld.so.cache problems
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/uclibc/ChangeLog6
-rw-r--r--dev-libs/uclibc/Manifest11
-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
4 files changed, 25 insertions, 7 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/Manifest b/dev-libs/uclibc/Manifest
index e7c072a75bb8..dbfdc61f68c2 100644
--- a/dev-libs/uclibc/Manifest
+++ b/dev-libs/uclibc/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 0795f8b490d7e16ac63e0340c0f59632 ChangeLog 6292
+MD5 4a4be87267e17bb4516688934ddec78d ChangeLog 6477
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 5db33bb13590ce0b1ac242639e60154e uclibc-0.9.26-r4.ebuild 7212
-MD5 df0798206db2720137ab14d08bf6d9f1 uclibc-0.9.26-r5.ebuild 7462
+MD5 83087f8ead787d9ee6c1aa3d56918cd2 uclibc-0.9.26-r5.ebuild 7578
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
@@ -30,10 +30,11 @@ MD5 d35beaf332590fed8c619483d4598dc6 files/0.9.26/uclibc-0.9.26-ssp-gcc34-after-
MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patch 15273
MD5 6835449424e7a8a38e9c85ecf1b73577 files/0.9.26/arm-ucontext.patch 303
MD5 efd96414f3be520f07eabd1c02be1ecb files/0.9.26/uclibc-0.9.26-resolve-segfault.patch 1227
+MD5 7157f784ba7672c9904d289712131a52 files/0.9.26/uclibc-0.9.26-ldso-cache.patch 410
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.9.8 (GNU/Linux)
-iD8DBQFBF6AnHTu7gpaalycRAmS9AKDBa13SM6EILt4QNtmCl0u7q+r7jACdF6Od
-hWGu8R3JSFQnEGV6G9iWpxk=
-=GjXj
+iD8DBQFBF8xKHTu7gpaalycRAjDzAJ0VaIFUr4se8tkbFlWwtItKkFqgXwCdFHoc
+mURYjULotJku6+Zg/+EHxEI=
+=TrJG
-----END PGP SIGNATURE-----
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