diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-18 23:14:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-18 23:14:16 +0000 |
| commit | 08b0123633a8cfe080cce21c60354b5403e53998 (patch) | |
| tree | 71c4ecf5e900bdaffa82eb708702696428559a72 /sys-libs/glibc | |
| parent | Version bump (diff) | |
| download | gentoo-2-08b0123633a8cfe080cce21c60354b5403e53998.tar.gz gentoo-2-08b0123633a8cfe080cce21c60354b5403e53998.tar.bz2 gentoo-2-08b0123633a8cfe080cce21c60354b5403e53998.zip | |
Disable --foreground in init.d script for older versions #431886 by Nick Bowler.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_install.eblit | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 01c8cede641a..a4fc21a84029 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,5 +1,10 @@ # ChangeLog for sys-libs/glibc -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.883 2012/08/18 18:40:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.884 2012/08/18 23:14:16 vapier Exp $ + + 18 Aug 2012; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_install.eblit: + Disable --foreground in init.d script for older versions #431886 by Nick + Bowler. 18 Aug 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.10.1-r1.ebuild, glibc-2.11.3.ebuild, glibc-2.12.1-r3.ebuild, glibc-2.12.2.ebuild, diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index 9e15b2f25204..6cddce9143ae 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-2012 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.22 2012/07/03 20:07:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.23 2012/08/18 23:14:16 vapier Exp $ toolchain-glibc_src_install() { local GBUILDDIR @@ -150,7 +150,11 @@ toolchain-glibc_src_install() { doins "${WORKDIR}"/extra/etc/*.conf || die doinitd "${WORKDIR}"/extra/etc/nscd || die - sed -i -e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):" "${D}"/etc/init.d/nscd + local nscd_args=( + -e "s:@PIDFILE@:$(strings "${D}"/usr/sbin/nscd | grep nscd.pid):" + ) + version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' ) + sed -i "${nscd_args[@]}" "${D}"/etc/init.d/nscd echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc doenvd "${T}"/00glibc || die |