commit: e344edc51afe402105fdef10b9feb48e9b738af8
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 13:16:30 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 14:03:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e344edc5
app-emulation/xen-tools: convert myconf to array, drop effectles sed
Also removes the unecessary --prefix argument, which econf does by
default since a few EAPIs.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild | 54 +++++++++-------------
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git a/app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild
b/app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild
index 72e135b35878..b788301f56fb 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild
@@ -318,10 +318,6 @@ src_prepare() {
# Fix texi2html build error with new texi2html, qemu.doc.html
sed -i -e "/texi2html -monolithic/s/-number//"
tools/qemu-xen-traditional/Makefile || die
- use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i
tools/Makefile || die
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)"
PYTHON=$(PYTHON) subdirs-$@:' \
- -i tools/firmware/Makefile || die
-
# Drop .config, fixes to gcc-4.6
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't
drop"
@@ -363,10 +359,6 @@ src_prepare() {
sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile ||
die
fi
- # Reset bash completion dir; Bug 472438
- sed -e "s:^BASH_COMPLETION_DIR ?=
\$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
- -i Config.mk || die
-
# xencommons, Bug #492332, sed lighter weight than patching
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-i tools/hotplug/Linux/init.d/xencommons.in || die
@@ -418,30 +410,30 @@ src_prepare() {
}
src_configure() {
- local myconf="--prefix=${PREFIX}/usr \
- --libdir=${PREFIX}/usr/$(get_libdir) \
- --libexecdir=${PREFIX}/usr/libexec \
- --localstatedir=${EPREFIX}/var \
- --disable-golang \
- --disable-werror \
- --disable-xen \
- --enable-tools \
- --enable-docs \
- $(use_enable api xenapi) \
- $(use_enable ipxe) \
- $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
- $(use_enable ocaml ocamltools) \
- $(use_enable ovmf) \
- $(use_enable pam) \
- $(use_enable rombios) \
- --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
- "
-
- use system-seabios && myconf+="
--with-system-seabios=/usr/share/seabios/bios.bin"
- use system-qemu && myconf+="
--with-system-qemu=/usr/bin/qemu-system-x86_64"
- use amd64 && myconf+=" $(use_enable qemu-traditional)"
+ local myconf=(
+ --libdir=${PREFIX}/usr/$(get_libdir)
+ --libexecdir=${PREFIX}/usr/libexec
+ --localstatedir=${EPREFIX}/var
+ --disable-golang
+ --disable-werror
+ --disable-xen
+ --enable-tools
+ --enable-docs
+ $(use_enable api xenapi)
+ $(use_enable ipxe)
+ $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
+ $(use_enable ocaml ocamltools)
+ $(use_enable ovmf)
+ $(use_enable pam)
+ $(use_enable rombios)
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
+ )
+
+ use system-seabios && myconf+=(
--with-system-seabios=/usr/share/seabios/bios.bin )
+ use system-qemu && myconf+=(
--with-system-qemu=/usr/bin/qemu-system-x86_64 )
+ use amd64 && myconf+=( $(use_enable qemu-traditional) )
tc-ld-disable-gold # Bug 669570
- econf ${myconf}
+ econf ${myconf[@]}
}
src_compile() {
