| 1 |
commit: c9e5ab69cf86dd0dd9be275b6fbc2eb2b531c6cc |
| 2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
| 3 |
AuthorDate: Tue Nov 12 14:02:59 2019 +0000 |
| 4 |
Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 2 14:41:42 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e5ab69 |
| 7 |
|
| 8 |
app-emulation/libvirt-9999: Perform out-of-tree build |
| 9 |
|
| 10 |
In preparation to move to meson, we've forbidden in tree builds. |
| 11 |
Fortunately, there is a gentoo eclass that handles out-of-tree |
| 12 |
builds and very little is needed to use it. However, due to some |
| 13 |
automake magic, we have to enable dependency-tracking (which is |
| 14 |
disabled as of EAPI 4) because if we don't, then generated |
| 15 |
Makefile doesn't precreate all directories under build dir and |
| 16 |
the build fails. |
| 17 |
|
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/13752 |
| 19 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
| 20 |
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org> |
| 21 |
|
| 22 |
app-emulation/libvirt/libvirt-9999.ebuild | 13 ++++++------- |
| 23 |
1 file changed, 6 insertions(+), 7 deletions(-) |
| 24 |
|
| 25 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 26 |
index 1c39aa69ee2..03d2e558566 100644 |
| 27 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 28 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 29 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 30 |
|
| 31 |
PYTHON_COMPAT=( python3_{5,6,7} ) |
| 32 |
|
| 33 |
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd |
| 34 |
+inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd |
| 35 |
|
| 36 |
if [[ ${PV} = *9999* ]]; then |
| 37 |
inherit git-r3 |
| 38 |
@@ -239,7 +239,7 @@ src_prepare() { |
| 39 |
eautoreconf |
| 40 |
} |
| 41 |
|
| 42 |
-src_configure() { |
| 43 |
+my_src_configure() { |
| 44 |
local myeconfargs=( |
| 45 |
$(use_with apparmor) |
| 46 |
$(use_with apparmor apparmor-profiles) |
| 47 |
@@ -295,6 +295,7 @@ src_configure() { |
| 48 |
--disable-werror |
| 49 |
|
| 50 |
--localstatedir=/var |
| 51 |
+ --enable-dependency-tracking |
| 52 |
) |
| 53 |
|
| 54 |
if use virtualbox && has_version app-emulation/virtualbox-ose; then |
| 55 |
@@ -308,13 +309,11 @@ src_configure() { |
| 56 |
if [[ ${PV} = *9999* ]]; then |
| 57 |
# Restore gnulib's config.sub and config.guess |
| 58 |
# bug #377279 |
| 59 |
- (cd .gnulib && git reset --hard > /dev/null) |
| 60 |
+ (cd ${S}/.gnulib && git reset --hard > /dev/null) |
| 61 |
fi |
| 62 |
} |
| 63 |
|
| 64 |
-src_test() { |
| 65 |
- cd "${BUILD_DIR}" |
| 66 |
- |
| 67 |
+my_src_test() { |
| 68 |
# remove problematic tests, bug #591416, bug #591418 |
| 69 |
sed -i -e 's#commandtest$(EXEEXT) # #' \ |
| 70 |
-e 's#virfirewalltest$(EXEEXT) # #' \ |
| 71 |
@@ -326,7 +325,7 @@ src_test() { |
| 72 |
HOME="${T}" emake check || die "tests failed" |
| 73 |
} |
| 74 |
|
| 75 |
-src_install() { |
| 76 |
+my_src_install() { |
| 77 |
emake DESTDIR="${D}" \ |
| 78 |
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install |
Archives