* [gentoo-commits] gentoo-x86 commit in app-emulation/xen-tools: xen-tools-3.4.2-r3.ebuild ChangeLog xen-tools-3.4.2-r2.ebuild
@ 2011-09-24 20:55 Tony Vroon (chainsaw)
0 siblings, 0 replies; only message in thread
From: Tony Vroon (chainsaw) @ 2011-09-24 20:55 UTC (permalink / raw
To: gentoo-commits
chainsaw 11/09/24 20:55:10
Modified: ChangeLog
Added: xen-tools-3.4.2-r3.ebuild
Removed: xen-tools-3.4.2-r2.ebuild
Log:
Revised patch by Ian "idella4" Delaney resolves building on GCC 4.5 & 4.6; closes bug #383977.
(Portage version: 2.1.10.18/cvs/Linux x86_64)
Revision Changes Path
1.91 app-emulation/xen-tools/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?r1=1.90&r2=1.91
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog 23 Sep 2011 17:09:51 -0000 1.90
+++ ChangeLog 24 Sep 2011 20:55:10 -0000 1.91
@@ -1,6 +1,14 @@
# ChangeLog for app-emulation/xen-tools
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.90 2011/09/23 17:09:51 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.91 2011/09/24 20:55:10 chainsaw Exp $
+
+*xen-tools-3.4.2-r3 (24 Sep 2011)
+
+ 24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> -xen-tools-3.4.2-r2.ebuild,
+ +xen-tools-3.4.2-r3.ebuild, -files/xen-tools-3.4.2-werror-idiocy.patch,
+ +files/xen-tools-3.4.2-werror-idiocy-v2.patch:
+ Revised patch by Ian "idella4" Delaney resolves building on GCC 4.5 & 4.6;
+ closes bug #383977.
*xen-tools-3.4.2-r2 (23 Sep 2011)
1.1 app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild?rev=1.1&content-type=text/plain
Index: xen-tools-3.4.2-r3.ebuild
===================================================================
# Copyright 1999-2011 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.4.2-r3.ebuild,v 1.1 2011/09/24 20:55:10 chainsaw Exp $
EAPI="3"
inherit base flag-o-matic eutils multilib python
# TPMEMUFILE=tpm_emulator-0.4.tar.gz
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
S="${WORKDIR}/xen-${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
CDEPEND="dev-lang/python[ncurses,threads]
sys-libs/zlib
hvm? ( media-libs/libsdl )
acm? ( dev-libs/libxml2 )
api? ( dev-libs/libxml2 net-misc/curl )"
# vtpm? ( dev-libs/gmp dev-libs/openssl )
DEPEND="${CDEPEND}
sys-devel/gettext
sys-devel/gcc
dev-lang/perl
dev-lang/python[ssl]
app-misc/pax-utils
doc? (
app-doc/doxygen
dev-tex/latex2html[png,gif]
dev-texlive/texlive-latexextra
media-gfx/transfig
media-gfx/graphviz
)
hvm? (
x11-proto/xproto
sys-devel/dev86
)"
RDEPEND="${CDEPEND}
sys-apps/iproute2
net-misc/bridge-utils
dev-python/pyxml
screen? (
app-misc/screen
app-admin/logrotate
)
|| ( sys-fs/udev sys-apps/hotplug )"
PATCHES=(
"${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
"${FILESDIR}/${PN}-3.3.0-nostrip.patch"
"${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
"${FILESDIR}/${P}-as-needed.patch"
"${FILESDIR}/${P}-fix-definitions.patch"
"${FILESDIR}/${P}-fix-include.patch"
"${FILESDIR}/${P}-werror-idiocy-v2.patch"
)
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
usr/share/xen/qemu/openbios-sparc64"
pkg_setup() {
export "CONFIG_LOMOUNT=y"
if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
eerror "an amd64 multilib profile is required. Remove the hvm use flag"
eerror "to build xen-tools on your current profile."
die "USE=hvm is unsupported on this system."
fi
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
if use x86 && use amd64; then
die "Confusion! Both x86 and amd64 are set in your use flags!"
elif use x86; then
export XEN_TARGET_ARCH="x86_32"
elif use amd64 ; then
export XEN_TARGET_ARCH="x86_64"
else
die "Unsupported architecture!"
fi
fi
# use vtpm && export "VTPM_TOOLS=y"
use api && export "LIBXENAPI_BINDINGS=y"
use acm && export "ACM_SECURITY=y"
use flask && export "FLASK_ENABLE=y"
}
src_prepare() {
base_src_prepare
# use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
# try and remove all the default custom-cflags
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} \;
fi
# Disable hvm support on systems that don't support x86_32 binaries.
if ! use hvm; then
chmod 644 tools/check/check_x11_devel
sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
fi
if ! use pygrub; then
sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
fi
}
src_compile() {
export VARTEXFONTS="${T}/fonts"
local myopt
use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
emake -C tools ${myopt} || die "compile failed"
if use doc; then
sh ./docs/check_pkgs || die "package check failed"
emake docs || die "compiling docs failed"
emake dev-docs || die "make dev-docs failed"
fi
emake -C docs man-pages || die "make man-pages failed"
}
src_install() {
make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \
|| die "install failed"
# Remove RedHat-specific stuff
rm -rf "${D}"/etc/sysconfig
dodoc README docs/README.xen-bugtool docs/ChangeLog
if use doc; then
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
|| die "install docs failed"
dohtml -r docs/api/
docinto pdf
dodoc docs/api/tools/python/latex/refman.pdf
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
fi
rm -rf "${D}"/usr/share/doc/xen/
doman docs/man?/*
newinitd "${FILESDIR}"/xend.initd-r1 xend \
|| die "Couldn't install xen.initd"
newconfd "${FILESDIR}"/xendomains.confd xendomains \
|| die "Couldn't install xendomains.confd"
newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \
|| die "Couldn't install xendomains.initd"
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
keepdir /var/log/xen-consoles
fi
# xend expects these to exist
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
# for xendomains
keepdir /etc/xen/auto
}
pkg_postinst() {
elog "Official Xen Guide and the unoffical wiki page:"
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
elog " http://en.gentoo-wiki.com/wiki/Xen/"
if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
echo
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"
ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
fi
if ! has_version "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 has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
elog "support enable the hvm use flag."
elog "An x86 or amd64 multilib system is required to build HVM support."
echo
elog "The ioemu use flag has been removed and replaced with hvm."
fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
python_mod_optimize $(use pygrub && echo grub) xen
}
pkg_postrm() {
python_mod_cleanup $(use pygrub && echo grub) xen
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-09-24 20:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-24 20:55 [gentoo-commits] gentoo-x86 commit in app-emulation/xen-tools: xen-tools-3.4.2-r3.ebuild ChangeLog xen-tools-3.4.2-r2.ebuild Tony Vroon (chainsaw)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox