diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-12-30 18:45:29 -0500 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-12-31 13:20:24 -0500 |
| commit | d57b303e1e5b3fc31da0769b14b01fdcc19b1f7a (patch) | |
| tree | 7f3abf9a52089b7e22fde4a7d983a736bb722b70 | |
| parent | 39d6b5fd42bda89f83ea26d6b0226eb7f76eb3c6 (diff) | |
| download | bitcoin-d57b303e1e5b3fc31da0769b14b01fdcc19b1f7a.tar.xz | |
depends: fix major regression after d546191dc.
Broken hash logic caused all depends on some platforms (osx at least) to end up
with the same build-id. Without this fix, nothing will be rebuilt when recipes
or dependencies change.
| -rw-r--r-- | depends/funcs.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/funcs.mk b/depends/funcs.mk index 79015c047c..337634253f 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -31,8 +31,8 @@ define fetch_file endef define int_get_build_recipe_hash -$(eval $(1)_all_file_checksums:=$(shell $(build_SHA256SUM) $(meta_depends) packages/$(1).mk $(addprefix $(PATCHES_PATH)/$(1)/,$($(1)_patches)))) -$(eval $(1)_recipe_hash:=$(shell echo -n "$($(1)_all_file_checksums)" | cut -d" " -f1 | $(build_SHA256SUM))) +$(eval $(1)_all_file_checksums:=$(shell $(build_SHA256SUM) $(meta_depends) packages/$(1).mk $(addprefix $(PATCHES_PATH)/$(1)/,$($(1)_patches)) | cut -d" " -f1)) +$(eval $(1)_recipe_hash:=$(shell echo -n "$($(1)_all_file_checksums)" | $(build_SHA256SUM) | cut -d" " -f1)) endef define int_get_build_id |