app-emulation/libvirt-9999: Update hash generation algorithm
authorMichal Privoznik <mprivozn@redhat.com>
Sun, 17 Mar 2019 05:50:06 +0000 (06:50 +0100)
committerMatthias Maier <tamiko@gentoo.org>
Sun, 17 Mar 2019 06:53:11 +0000 (01:53 -0500)
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 <mprivozn@redhat.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
app-emulation/libvirt/libvirt-9999.ebuild

index ad8ef5b0f12d9b156ea5f0de352e86f4a9bd5bd7..d297b556e5b8f8109ed4b1d295408bff238c32f2 100644 (file)
@@ -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