From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 414E2138334 for ; Mon, 2 Dec 2019 14:42:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 789BBE086E; Mon, 2 Dec 2019 14:42:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60221E086E for ; Mon, 2 Dec 2019 14:42:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07D4F34D6BC for ; Mon, 2 Dec 2019 14:42:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D57038C9 for ; Mon, 2 Dec 2019 14:42:17 +0000 (UTC) From: "Doug Goldstein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Doug Goldstein" Message-ID: <1575297702.c9e5ab69cf86dd0dd9be275b6fbc2eb2b531c6cc.cardoe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Goldstein X-VCS-Revision: c9e5ab69cf86dd0dd9be275b6fbc2eb2b531c6cc X-VCS-Branch: master Date: Mon, 2 Dec 2019 14:42:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91e49385-639d-42bc-91df-dedc0ddcdbe7 X-Archives-Hash: 8907ddc4437cfe78701401aff4b36d5b commit: c9e5ab69cf86dd0dd9be275b6fbc2eb2b531c6cc Author: Michal Privoznik redhat com> AuthorDate: Tue Nov 12 14:02:59 2019 +0000 Commit: Doug Goldstein gentoo org> CommitDate: Mon Dec 2 14:41:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e5ab69 app-emulation/libvirt-9999: Perform out-of-tree build In preparation to move to meson, we've forbidden in tree builds. Fortunately, there is a gentoo eclass that handles out-of-tree builds and very little is needed to use it. However, due to some automake magic, we have to enable dependency-tracking (which is disabled as of EAPI 4) because if we don't, then generated Makefile doesn't precreate all directories under build dir and the build fails. Closes: https://github.com/gentoo/gentoo/pull/13752 Signed-off-by: Michal Privoznik redhat.com> Signed-off-by: Doug Goldstein gentoo.org> app-emulation/libvirt/libvirt-9999.ebuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 1c39aa69ee2..03d2e558566 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) -inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd +inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -239,7 +239,7 @@ src_prepare() { eautoreconf } -src_configure() { +my_src_configure() { local myeconfargs=( $(use_with apparmor) $(use_with apparmor apparmor-profiles) @@ -295,6 +295,7 @@ src_configure() { --disable-werror --localstatedir=/var + --enable-dependency-tracking ) if use virtualbox && has_version app-emulation/virtualbox-ose; then @@ -308,13 +309,11 @@ src_configure() { if [[ ${PV} = *9999* ]]; then # Restore gnulib's config.sub and config.guess # bug #377279 - (cd .gnulib && git reset --hard > /dev/null) + (cd ${S}/.gnulib && git reset --hard > /dev/null) fi } -src_test() { - cd "${BUILD_DIR}" - +my_src_test() { # remove problematic tests, bug #591416, bug #591418 sed -i -e 's#commandtest$(EXEEXT) # #' \ -e 's#virfirewalltest$(EXEEXT) # #' \ @@ -326,7 +325,7 @@ src_test() { HOME="${T}" emake check || die "tests failed" } -src_install() { +my_src_install() { emake DESTDIR="${D}" \ SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install