diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-12-30 18:45:29 -0500 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-02 11:15:17 +0100 |
| commit | 9241f7a7c1259379c667a8fbd22fd0d929b335b1 (patch) | |
| tree | 34749945939e4e711426a91e4f679b30e7788a70 /depends | |
| parent | 4f57a3b20c693f75be6fe7872192f3f2ef223d41 (diff) | |
| download | bitcoin-9241f7a7c1259379c667a8fbd22fd0d929b335b1.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.
Rebased-From: d57b303e1e5b3fc31da0769b14b01fdcc19b1f7a
Github-Pull: #5586
Diffstat (limited to 'depends')
| -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 |