diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-10-09 16:34:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-09 16:34:39 +0000 |
| commit | bb3e9f8af45277aa74a5712164c028b5e5d7fc57 (patch) | |
| tree | 68ed7ad846fb42b34df86b895bd7e89bfd34f9d7 /sys-apps | |
| parent | x86 stable, bug #365951 (diff) | |
| download | gentoo-2-bb3e9f8af45277aa74a5712164c028b5e5d7fc57.tar.gz gentoo-2-bb3e9f8af45277aa74a5712164c028b5e5d7fc57.tar.bz2 gentoo-2-bb3e9f8af45277aa74a5712164c028b5e5d7fc57.zip | |
Add sanity check for $DEFAULT_ABI #385993 by Christian Samsel.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.1.ebuild | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 950cfe54f1f4..a7fc64374eb5 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.513 2011/10/04 18:36:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.514 2011/10/09 16:34:39 vapier Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog + 09 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild: + Add sanity check for $DEFAULT_ABI #385993 by Christian Samsel. + 04 Oct 2011; Mike Frysinger <vapier@gentoo.org> baselayout-2.1.ebuild: Try to make error output a little more understandable #385625 by Paul Varner. diff --git a/sys-apps/baselayout/baselayout-2.1.ebuild b/sys-apps/baselayout/baselayout-2.1.ebuild index 9b157fa7d29a..f84919f392a0 100644 --- a/sys-apps/baselayout/baselayout-2.1.ebuild +++ b/sys-apps/baselayout/baselayout-2.1.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-apps/baselayout/baselayout-2.1.ebuild,v 1.2 2011/10/04 18:36:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1.ebuild,v 1.3 2011/10/09 16:34:39 vapier Exp $ inherit eutils multilib @@ -36,6 +36,8 @@ multilib_layout() { local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + # figure out which paths should be symlinks and which should be directories local dirs syms exp d for libdir in ${libdirs} ; do |