From 1a88084e8baffbe1b8fbe4d62c52ddc90d1a9e88 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Sun, 17 Mar 2019 06:50:06 +0100 Subject: app-emulation/libvirt-9999: Update hash generation algorithm I've noticed that bootstrap is run twice. This is because the first time it is run in src_prepare() and there some hash is computed so later when src_configre() gets its word it'll find everything prepared. Well, in the upstream commit of 6d53255377b50b7e412350d079 the hash was changed therefore src_configure() did not find the expected hash and thus re-ran the bootstrap script. Signed-off-by: Michal Privoznik Signed-off-by: Matthias Maier --- app-emulation/libvirt/libvirt-9999.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app-emulation') diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index ad8ef5b0f12d..d297b556e5b8 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -226,8 +226,9 @@ src_prepare() { # bug #377279 ./bootstrap || die "bootstrap failed" ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf + git submodule status .gnulib | awk '{ print $1 }' + git hash-object bootstrap.conf + git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' ) >.git-module-status fi -- cgit v1.2.3-65-gdbad