External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

build: change to gnulib module list should rerun bootstrap

Browse Source 
* autogen.sh (curr_status): Also include hash of bootstrap.conf
when checking for changes that require bootstrap rerun.
* cfg.mk (_update_required): Likewise.
This commit is contained in:
Eric Blake 2010-03-10 10:03:29 -07:00 committed by Jim Meyering
parent 89a08ba63a
commit 3b04f3bb0f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autogen.sh
View File

@ -65,7 +65,8 @@ fi
# Ensure that whenever we pull in a gnulib update or otherwise change to a # Ensure that whenever we pull in a gnulib update or otherwise change to a
# different version (i.e., when switching branches), we also rerun ./bootstrap. # different version (i.e., when switching branches), we also rerun ./bootstrap.
curr_status=.git-module-status curr_status=.git-module-status
t=$(git submodule status|sed 's/^[ +-]//;s/ .*//') t=$(git submodule status|sed 's/^[ +-]//;s/ .*//'; \
git hash-object bootstrap.conf)
if test "$t" = "$(cat $curr_status 2>/dev/null)"; then if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
: # good, it's up to date, all we need is autoreconf : # good, it's up to date, all we need is autoreconf
autoreconf -if autoreconf -if

3
cfg.mk
View File

@ -279,7 +279,8 @@ ifeq (0,$(MAKELEVEL))
# b653eda3ac4864de205419d9f41eec267cb89eeb # b653eda3ac4864de205419d9f41eec267cb89eeb
_submodule_hash = sed 's/^[ +-]//;s/ .*//' _submodule_hash = sed 's/^[ +-]//;s/ .*//'
_update_required := $(shell \ _update_required := $(shell \
actual=$$(git submodule status | $(_submodule_hash)); \ actual=$$(git submodule status | $(_submodule_hash); \
git hash-object bootstrap.conf); \
stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \ stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \
test "$$stamp" = "$$actual"; echo $$?) test "$$stamp" = "$$actual"; echo $$?)
ifeq (1,$(_update_required)) ifeq (1,$(_update_required))