diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-08-15 22:44:10 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-08-15 22:48:36 -0400 |
| commit | 1910910ddeeb319f0c863ba2fd37364c81338b8f (patch) | |
| tree | 0f2fbf6a2f236887e1d10e7bdc406043df451553 /depends/funcs.mk | |
| parent | 984ff68c679e9a40e14e791c6363c6136639a686 (diff) | |
| download | bitcoin-1910910ddeeb319f0c863ba2fd37364c81338b8f.tar.xz | |
depends: fix shasum on osx < 10.9
Shasum verification from stdin doesn't work there, so we write to a file
instead.
Formatted a bit too.
Diffstat (limited to 'depends/funcs.mk')
| -rw-r--r-- | depends/funcs.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/depends/funcs.mk b/depends/funcs.mk index 4c47cc926e..b5d8b0ee2e 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -20,7 +20,11 @@ $(sort $(foreach dep,$(2),$(2) $(call int_get_all_dependencies,$(1),$($(dep)_dep endef define fetch_file -(test -f $(SOURCES_PATH)/$(3) || ( mkdir -p $$($(1)_extract_dir) && $(build_DOWNLOAD) "$$($(1)_extract_dir)/$(3).temp" "$(2)" && echo "$(4) $$($(1)_extract_dir)/$(3).temp" | $(build_SHA256SUM) -c && mv $$($(1)_extract_dir)/$(3).temp $(SOURCES_PATH)/$(3) )) +(test -f $(SOURCES_PATH)/$(3) || \ + ( mkdir -p $$($(1)_extract_dir) && $(build_DOWNLOAD) "$$($(1)_extract_dir)/$(3).temp" "$(2)" && \ + echo "$(4) $$($(1)_extract_dir)/$(3).temp" > $$($(1)_extract_dir)/.$(3).hash && \ + $(build_SHA256SUM) -c $$($(1)_extract_dir)/.$(3).hash && \ + mv $$($(1)_extract_dir)/$(3).temp $(SOURCES_PATH)/$(3) )) endef define int_get_build_recipe_hash @@ -62,7 +66,7 @@ $(1)_download_path_fixed=$(subst :,\:,$$($(1)_download_path)) #default commands $(1)_fetch_cmds ?= $(call fetch_file,$(1),$(subst \:,:,$$($(1)_download_path_fixed)/$$($(1)_download_file)),$($(1)_file_name),$($(1)_sha256_hash)) -$(1)_extract_cmds ?= echo "$$($(1)_sha256_hash) $$($(1)_source)" | $(build_SHA256SUM) -c && tar --strip-components=1 -xf $$($(1)_source) +$(1)_extract_cmds ?= mkdir -p $$($(1)_extract_dir) && echo "$$($(1)_sha256_hash) $$($(1)_source)" > $$($(1)_extract_dir)/.$$($(1)_file_name).hash && $(build_SHA256SUM) -c $$($(1)_extract_dir)/.$$($(1)_file_name).hash && tar --strip-components=1 -xf $$($(1)_source) $(1)_preprocess_cmds ?= $(1)_build_cmds ?= $(1)_config_cmds ?= |