diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-12-19 23:44:55 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-19 23:44:55 +0000 |
| commit | 332a9be7410113d1cc026901b921c91a11e04f2c (patch) | |
| tree | e9f6a58ee6e2da5f27b86081607644fae3df4376 /sys-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-332a9be7410113d1cc026901b921c91a11e04f2c.tar.gz gentoo-2-332a9be7410113d1cc026901b921c91a11e04f2c.tar.bz2 gentoo-2-332a9be7410113d1cc026901b921c91a11e04f2c.zip | |
Start pointing ldconfig files to ld.so.conf.d.
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/pkg_preinst.eblit | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_install.eblit | 5 |
3 files changed, 13 insertions, 3 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/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 |