diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-07 19:18:12 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-07 19:18:12 +0000 |
| commit | 3bd44d1ca38680246bd731c31c802a46e13d4776 (patch) | |
| tree | a7d47a0616022853366dfb9080b5b2d045819f2f /sys-libs | |
| parent | Add gnome to metadata as talked between us since empathy relies on this. (diff) | |
| download | gentoo-2-3bd44d1ca38680246bd731c31c802a46e13d4776.tar.gz gentoo-2-3bd44d1ca38680246bd731c31c802a46e13d4776.tar.bz2 gentoo-2-3bd44d1ca38680246bd731c31c802a46e13d4776.zip | |
Abort if sys-devel/prelink is installed wrt #353814.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.13.ebuild | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 8a471ce68d54..dcecb22de09d 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.742 2011/02/07 07:27:39 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.743 2011/02/07 19:18:12 ssuominen Exp $ + + 07 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> glibc-2.13.ebuild: + Abort if sys-devel/prelink is installed wrt #353814. 07 Feb 2011; Joshua Kinard <kumba@gentoo.org> glibc-2.5-r4.ebuild, glibc-2.5.1.ebuild: diff --git a/sys-libs/glibc/glibc-2.13.ebuild b/sys-libs/glibc/glibc-2.13.ebuild index 7596918f7807..45e54729d5b6 100644 --- a/sys-libs/glibc/glibc-2.13.ebuild +++ b/sys-libs/glibc/glibc-2.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.2 2011/02/06 15:59:39 zorry Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13.ebuild,v 1.3 2011/02/07 19:18:12 ssuominen Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -197,6 +197,12 @@ pkg_setup() { eerror "glibc, then you may rebuild coreutils with USE=static." die "Avoiding system meltdown #332927" fi + + if has_version sys-devel/prelink; then + eerror "Aborting. Your system might be prelinked." + eerror "Unprelink your system and uninstall sys-devel/prelink first." + die "Avoid system meltdown #353814" + fi } eblit-src_unpack-post() { |