Start pointing ldconfig files to ld.so.conf.d.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 16 insertions, 6 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 1a7d1f0ee73c..6651cde4c696 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.666 2009/12/10 01:31:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.667 2009/12/19 23:44:55 vapier Exp $
+
+  19 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/pkg_preinst.eblit, files/eblits/src_install.eblit:
+  Start pointing ldconfig files to ld.so.conf.d.
 
   10 Dec 2009; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5-r3.ebuild,
   glibc-2.3.6-r4.ebuild, glibc-2.3.6-r5.ebuild, glibc-2.4-r4.ebuild,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 1ef440911ff9..f8f619140da8 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -13,11 +13,11 @@ AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292af
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
 AUX eblits/common.eblit 8642 RMD160 41ce2abf35f79db5a8cd4742d1f98e30287eb8dd SHA1 e261b11759b9b6a96be162c821960823d69350b5 SHA256 034c104805d22ba865ae454288813f63c25d47fd695c1e58c1fdaa972ba8e167
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
-AUX eblits/pkg_preinst.eblit 3285 RMD160 990d7ee7cfa1ba79a19bc6c01c05817ebfc0ee96 SHA1 3ee2fe58fa7ca246311cf5ef23fa1ccbe509cf49 SHA256 8bc7dea37213048787ce0bec61e9abe8adabb547b5385024bf2549d0a036239c
+AUX eblits/pkg_preinst.eblit 3363 RMD160 5c5d0c1c8e0a1a5918ae54006c201f1c81e70589 SHA1 5515220d1cc8453c5ae9cec02f6e6b8c3f575d91 SHA256 5e9291a6096fcaed6102a3248e8804a726dcf80d68eedc4d4be70b25394de2e3
 AUX eblits/pkg_setup.eblit 2814 RMD160 8352c4b9cc460b7193e17be8bca227db5b6df5ba SHA1 8de7ea78e364521b55574b16036d57e7d35a596f SHA256 b803723f75571649e10e0707a6dbe8b459eabdc149ef155558792db736faa201
 AUX eblits/src_compile.eblit 5843 RMD160 2fffbc9b3cd5a5b5c21de778ea2614927fcbf54d SHA1 79e80f2ebb3e5739941a7a3e85b5e5f46240211a SHA256 f6e19e703a0849c0a14e941c92991f50516938ca7b6bd6fe74bdf1c9a96ec4c5
 AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e
-AUX eblits/src_install.eblit 7994 RMD160 0f3fc3715f589ae485f730686acb69a11d31960a SHA1 51db782428290a5a641a48038e6436dd50efca5e SHA256 61ddbb1cf22f79662235a67c29c704059a6dbfaf6f501b6b12c3895c2593747b
+AUX eblits/src_install.eblit 8084 RMD160 ce93214a4180a4ed15fa4e18bc5ae126d9d1065e SHA1 4dade5c8e7d041fe967e687ed69b32c2b4736f14 SHA256 009b5ed1f53cddfb3cd7d1ce63d75cff3bdb0d059ae52a6ffd188c731c8bd1ee
 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962
 AUX eblits/src_unpack.eblit 5148 RMD160 59fe45ab19ab005b9ad1fe1d5fcfa41cf3f3fdde SHA1 c8b0099903b1bc861bab0b9bf43cda2e4b5148e2 SHA256 28d475d0154ee2eb54eda4c0711accccbae80ce3c537470d076006734705e7dd
 AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
@@ -70,5 +70,5 @@ EBUILD glibc-2.7-r2.ebuild 12942 RMD160 0b451bf4a43264029c663f309af95d5a0f34d41f
 EBUILD glibc-2.8_p20080602-r1.ebuild 13485 RMD160 ea0806247d4ae3107b2d544dca55c164cb5271aa SHA1 20e6d2aa522e0421c4f5488d5f24ea34ce02d8b4 SHA256 532211b5b7a177bbcb8ba5a8b01523a9aae8d631a50f4dd7b1a5722a8e375f24
 EBUILD glibc-2.9_p20081201-r2.ebuild 7771 RMD160 5e96c32ef0f330934755c3433caaff17f241e312 SHA1 9d0e2e13d4938657261f1c3a9e6d3c1b22deeb14 SHA256 1b7e3be124753462d7c4dad169e91ceb66341da86acac8c7789a3c1caf0d65d8
 EBUILD glibc-2.9_p20081201-r3.ebuild 7803 RMD160 0ace363c7469985ef16fead41d6de975f221eda4 SHA1 3ea87286571e84036d7c231dd08a6836beece136 SHA256 55dd46fb4003aa70a554a0072f7550effef28f0ac13a12fefcbb26989465ca4c
-MISC ChangeLog 123231 RMD160 ebaa2b515009c35268c182cb9ec94a058e8085e0 SHA1 4536c6a0f5c2529a9c79a66bf1c5b88ec8721777 SHA256 2b1c83e4ea4a07ff7f572db3f365178abeb3af34a0beeb42150764a41d7e9442
+MISC ChangeLog 123397 RMD160 dc27b90c096eb8e0f022fdd1a5536e5d195e8c7d SHA1 41a6ddb21cee240038271c846e0448af05fca11f SHA256 c5548a631c57f3b86966ffd0efd226d069c6d2ffb5a1f965ef2c12230a455c04
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index dcc5d9b12e3a..c161640c7c4c 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.1 2009/03/01 21:06:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.2 2009/12/19 23:44:54 vapier Exp $
 
 fix_lib64_symlinks() {
 	# the original Gentoo/AMD64 devs decided that since 64bit is the native
@@ -59,6 +59,9 @@ eblit-glibc-pkg_preinst() {
 		rm -r "${ROOT}"/$(alt_libdir)/tls || die
 	fi
 
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${ROOT}"/etc/ld.so.conf.d
+
 	# simple test to make sure our new glibc isnt completely broken.
 	# make sure we don't test with statically built binaries since
 	# they will fail.  also, skip if this glibc is a cross compiler.
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 39d09e63cdf7..65a4ae89895b 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.8 2009/09/18 15:15:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.9 2009/12/19 23:44:54 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local GBUILDDIR
@@ -175,6 +175,9 @@ toolchain-glibc_src_install() {
 
 	sed -i -e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):" "${D}"/etc/init.d/nscd
 
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc || die
+
 	dodoc BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README*
 
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the