summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Marineau <marineam@gentoo.org>2007-07-10 17:28:02 +0000
committerMichael Marineau <marineam@gentoo.org>2007-07-10 17:28:02 +0000
commit11429fc104e4d4993746e0821ec05aac9cdd1e5d (patch)
tree7b8938c47614747f3171d1b70db91d0eeadb0ffd /app-emulation/xen-tools
parentStable on amd64 wrt bug #182366 (diff)
downloadgentoo-2-11429fc104e4d4993746e0821ec05aac9cdd1e5d.tar.gz
gentoo-2-11429fc104e4d4993746e0821ec05aac9cdd1e5d.tar.bz2
gentoo-2-11429fc104e4d4993746e0821ec05aac9cdd1e5d.zip
Remove unneeded flag checking from xen-tools
(Portage version: 2.1.2.9)
Diffstat (limited to 'app-emulation/xen-tools')
-rw-r--r--app-emulation/xen-tools/ChangeLog7
-rw-r--r--app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild22
2 files changed, 18 insertions, 11 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 59c153ad6d46..373e0f489882 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.23 2007/06/25 22:24:50 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.24 2007/07/10 17:28:02 marineam Exp $
+
+ 10 Jul 2007; Michael Marineau <marineam@gentoo.org>
+ xen-tools-3.0.4_p1.ebuild:
+ Remove unneeded hardened flag checking and add some more info to the post
+ install message.
25 Jun 2007; Michael Marineau <marineam@gentoo.org>
xen-tools-3.0.4_p1.ebuild:
diff --git a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild b/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
index 3e8449917669..68248c524a50 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
@@ -1,6 +1,6 @@
# 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.4_p1.ebuild,v 1.3 2007/06/25 22:24:50 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild,v 1.4 2007/07/10 17:28:02 marineam Exp $
inherit flag-o-matic distutils eutils multilib
@@ -82,15 +82,6 @@ src_unpack() {
-i {} \;
fi
- # xen tries to be smart and filter out CFLAGs not supported by gcc.
- # It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does.
- for FLAG in -fno-pie -fno-stack-protector -fno-stack-protector-all; do
- test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}"
- done
- sed -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" \
- "${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile
-
-
# Disable the 32bit-only vmxassist if we are not on x86 and we don't
# support the x86 ABI. Also disable hvmloader, since it requires vmxassist.
if ! use x86 && ! has x86 $(get_all_abis); then
@@ -181,12 +172,23 @@ pkg_postinst() {
elog "Please visit the Xen and Gentoo wiki:"
elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+ if [[ "$(scanelf -s __guard -q `which 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
+
if ! built_with_use dev-lang/python ncurses; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
+ if ! use x86 && ! has x86 $(get_all_abis); then
+ echo
+ elog "Your system does not support building x86 binaries (amd64 no-multilib)"
+ elog "hvmloader has not been built, which is required for HVM guests."
+ fi
+
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."