diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-03-12 13:34:31 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-03-12 13:34:31 +0000 |
| commit | 033afaccaf8d98f3e49b489107889aee8c1e649e (patch) | |
| tree | 15ad54a27d6a74108be299b1b75a755838794eb5 /sys-libs/glibc | |
| parent | Drop unused mips patch filtering since it isn't in the patchset anymore. (diff) | |
| download | historical-033afaccaf8d98f3e49b489107889aee8c1e649e.tar.gz historical-033afaccaf8d98f3e49b489107889aee8c1e649e.tar.bz2 historical-033afaccaf8d98f3e49b489107889aee8c1e649e.zip | |
Install the systemd files from upstream with glibc-2.19+.
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_install.eblit | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 69d1f5a2c070..4421bfadff48 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.983 2014/03/12 13:34:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.984 2014/03/12 13:34:31 vapier Exp $ + + 12 Mar 2014; Mike Frysinger <vapier@gentoo.org> + files/eblits/src_install.eblit: + Install the systemd files from upstream with glibc-2.19+. 12 Mar 2014; Mike Frysinger <vapier@gentoo.org> glibc-2.19.ebuild: Drop unused mips patch filtering since it isn't in the patchset anymore. diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index f7d00cd76cfc..8f72c43f55fa 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-2014 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.33 2014/01/17 07:45:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.34 2014/03/12 13:34:31 vapier Exp $ toolchain-glibc_src_install() { local GBUILDDIR @@ -185,7 +185,12 @@ toolchain-glibc_src_install() { version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' ) sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd - if [[ $(type -t systemd_dounit) == "function" ]] ; then + # Newer versions of glibc include the nscd.service themselves. + # TODO: Drop the $FILESDIR copy once 2.19 goes stable. + if version_is_at_least 2.19 ; then + systemd_dounit nscd/nscd.service || die + systemd_newtmpfilesd nscd/nscd.tmpfiles || die + else systemd_dounit "${FILESDIR}"/nscd.service || die systemd_newtmpfilesd "${FILESDIR}"/nscd.tmpfilesd nscd.conf || die fi |