diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-06-14 22:19:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-06-14 22:19:10 +0000 |
| commit | 7ccea0f8409e996a3f83429db1ba91a867c89c46 (patch) | |
| tree | 540fc1c6902a4463eba851ab34f5e9580bf28c45 /sys-libs | |
| parent | amd64 stable wrt bug #510944 (diff) | |
| download | gentoo-2-7ccea0f8409e996a3f83429db1ba91a867c89c46.tar.gz gentoo-2-7ccea0f8409e996a3f83429db1ba91a867c89c46.tar.bz2 gentoo-2-7ccea0f8409e996a3f83429db1ba91a867c89c46.zip | |
Check MERGE_TYPE when doing downgrade check #255109 by Phil White.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/pkg_setup.eblit | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index dfee6e900505..4ef19e952edd 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # 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.993 2014/06/14 08:07:10 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.994 2014/06/14 22:19:10 vapier Exp $ + + 14 Jun 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit: + Check MERGE_TYPE when doing downgrade check #255109 by Phil White. 14 Jun 2014; Ryan Hill <rhill@gentoo.org> files/eblits/common.eblit: Strip -fstack-protector*. These flags are now enabled by default so we can diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit index 1bf06c259670..8b8e547d9d73 100644 --- a/sys-libs/glibc/files/eblits/pkg_setup.eblit +++ b/sys-libs/glibc/files/eblits/pkg_setup.eblit @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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/pkg_setup.eblit,v 1.11 2013/06/29 03:22:32 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.12 2014/06/14 22:19:10 vapier Exp $ glibc_compile_test() { local ret save_cflags=${CFLAGS} @@ -48,7 +48,10 @@ glibc_run_test() { eblit-glibc-pkg_setup() { # prevent native builds from downgrading ... maybe update to allow people # to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2) - if [[ ${ROOT} == "/" ]] && [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then + if [[ ${MERGE_TYPE} != "buildonly" ]] && \ + [[ ${ROOT} == "/" ]] && \ + [[ ${CBUILD} == ${CHOST} ]] && \ + [[ ${CHOST} == ${CTARGET} ]] ; then if has_version '>'${CATEGORY}/${PF} ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction" |