summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-10-18 23:09:51 +0000
committerMike Frysinger <vapier@gentoo.org>2014-10-18 23:09:51 +0000
commit8ff11a3031c2740af64d3a0f1d92f05240079342 (patch)
tree93d33741b3f167af2ce819bb8c1929d236e4fa90 /sys-libs
parentAdd lzop fix from upstream #515254 by Kristian Fiskerstrand. Add USE=debug t... (diff)
downloadgentoo-2-8ff11a3031c2740af64d3a0f1d92f05240079342.tar.gz
gentoo-2-8ff11a3031c2740af64d3a0f1d92f05240079342.tar.bz2
gentoo-2-8ff11a3031c2740af64d3a0f1d92f05240079342.zip
Tweak nonfatal wrapping #523332#9 by Alexander Tsoy.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/files/eblits/common.eblit6
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index bea1830385c5..ddc96dbd02ac 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.1026 2014/10/17 17:30:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1027 2014/10/18 23:09:51 vapier Exp $
+
+ 18 Oct 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+ Tweak nonfatal wrapping #523332#9 by Alexander Tsoy.
17 Oct 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
files/eblits/pkg_setup.eblit, glibc-2.19-r1.ebuild:
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 0b902a4311a3..2f7471ed3297 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.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/common.eblit,v 1.44 2014/10/17 17:30:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.45 2014/10/18 23:09:51 vapier Exp $
alt_prefix() {
is_crosscompile && echo /usr/${CTARGET}
@@ -10,12 +10,12 @@ if [[ ${EAPI:-0} == [012] ]] ; then
: ${ED:=${D}}
: ${EROOT:=${ROOT}}
fi
+# This indirection is for binpkgs. #523332
+_nonfatal() { nonfatal "$@" ; }
if [[ ${EAPI:-0} == [0123] ]] ; then
nonfatal() { "$@" ; }
_nonfatal() { "$@" ; }
fi
-# This indirection is for binpkgs. #523332
-_nonfatal() { nonfatal "$@" ; }
# We need to be able to set alternative headers for
# compiling for non-native platform