summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ross <aross@gentoo.org>2007-03-13 06:26:34 +0000
committerAndrew Ross <aross@gentoo.org>2007-03-13 06:26:34 +0000
commit94d294532a00795c622e2465cbb456254e0ff3e1 (patch)
tree71fa42994fefc5b54b88b2a88aab6072f672f843 /app-emulation/xen-tools
parentPush out misc fixes and include new hardened/hppa work. (diff)
downloadgentoo-2-94d294532a00795c622e2465cbb456254e0ff3e1.tar.gz
gentoo-2-94d294532a00795c622e2465cbb456254e0ff3e1.tar.bz2
gentoo-2-94d294532a00795c622e2465cbb456254e0ff3e1.zip
Use "type" instead of "which", as per http://archives.gentoo.org/gentoo-dev/msg_143424.xml
(Portage version: 2.1.2-r9)
Diffstat (limited to 'app-emulation/xen-tools')
-rw-r--r--app-emulation/xen-tools/ChangeLog9
-rw-r--r--app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild6
-rw-r--r--app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild6
3 files changed, 13 insertions, 8 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 337aa6f66619..7596d3540370 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/xen-tools
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.19 2006/12/16 04:38:32 aross Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.20 2007/03/13 06:26:34 aross Exp $
+
+ 13 Mar 2007; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r3.ebuild,
+ xen-tools-3.0.2-r4.ebuild:
+ Use "type" instead of "which", as per
+ http://archives.gentoo.org/gentoo-dev/msg_143424.xml
16 Dec 2006; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r4.ebuild:
Narrow dep on app-emulation/xen to match version of xen-tools.
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
index 3457ddd72af1..3a39045b794c 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild,v 1.1 2006/08/14 07:11:47 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild,v 1.2 2007/03/13 06:26:34 aross Exp $
inherit mount-boot flag-o-matic distutils eutils multilib
@@ -54,7 +54,7 @@ pkg_setup() {
ewarn "will be enabled anyway."
fi
- if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
+ if [[ "$(scanelf -s __guard -q `type -P python`)" ]] ; then
eerror "xend doesn't work when python is built with stack smashing protection (ssp)."
eerror "Please append the following to your CFLAGS and remerge python:"
eerror " '-fno-stack-protector -fno-stack-protector-all'"
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
index ff4b7d933e26..4dc898b13847 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild,v 1.2 2006/12/16 04:38:32 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild,v 1.3 2007/03/13 06:26:34 aross Exp $
inherit mount-boot flag-o-matic distutils eutils multilib
@@ -49,7 +49,7 @@ pkg_setup() {
ewarn "will be enabled anyway."
fi
- if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
+ if [[ "$(scanelf -s __guard -q `type -P python`)" ]] ; then
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
fi