sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#24285: build, refactor: Drop useless call Make function

Browse Source 
e644591426fb4ee1bba5c4bfdde85eb378258272 build, refactor: Drop useless `call` Make function (Hennadii Stepanov)

Pull request description:

  Using the [`call`](https://www.gnu.org/software/make/manual/html_node/Call-Function.html) function with `$(package)_*_cmds` is effectively noop because the latter, which could be found in `<package>.mk` files, do not use temporary `$(1)` variable at all.

  This PR removes useless calls of the `call` function, and makes code more readable and easier to reason about.

  No change in resulted dependency binaries could be easy verified with bitcoin/bitcoin/#21995.

ACKs for top commit:
  laanwj:
    Code review ACK e644591426fb4ee1bba5c4bfdde85eb378258272
  shaavan:
    Code review ACK e644591426fb4ee1bba5c4bfdde85eb378258272

Tree-SHA512: 8481fa0dc5bbf7dd6a180f7fae5a2ccc07f85b50c7a966bceb2d7e010e07e5f211ee3f74f8ac79bc5acfde5f0764264d599d959ff3ebb8511b1b4a33f79509bd
This commit is contained in:
laanwj 2022-04-13 22:27:36 +02:00 committed by pasta
parent 5a18a539db
commit bd36ec9a85
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
depends/funcs.mk
View File

@ -171,40 +171,40 @@ $($(1)_fetched):
mkdir -p $$(@D) $(SOURCES_PATH) mkdir -p $$(@D) $(SOURCES_PATH)
rm -f $$@ rm -f $$@
touch $$@ touch $$@
cd $$(@D); $(call $(1)_fetch_cmds,$(1)) cd $$(@D); $($(1)_fetch_cmds)
cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);) cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);)
touch $$@ touch $$@
$($(1)_extracted): | $($(1)_fetched) $($(1)_extracted): | $($(1)_fetched)
echo Extracting $(1)... echo Extracting $(1)...
mkdir -p $$(@D) mkdir -p $$(@D)
cd $$(@D); $(call $(1)_extract_cmds,$(1)) cd $$(@D); $($(1)_extract_cmds)
touch $$@ touch $$@
$($(1)_preprocessed): | $($(1)_extracted) $($(1)_preprocessed): | $($(1)_extracted)
echo Preprocessing $(1)... echo Preprocessing $(1)...
mkdir -p $$(@D) $($(1)_patch_dir) mkdir -p $$(@D) $($(1)_patch_dir)
$(foreach patch,$($(1)_patches),cd $(PATCHES_PATH)/$(1); cp $(patch) $($(1)_patch_dir) ;) $(foreach patch,$($(1)_patches),cd $(PATCHES_PATH)/$(1); cp $(patch) $($(1)_patch_dir) ;)
cd $$(@D); $(call $(1)_preprocess_cmds, $(1)) cd $$(@D); $($(1)_preprocess_cmds)
touch $$@ touch $$@
$($(1)_configured): | $($(1)_dependencies) $($(1)_preprocessed) $($(1)_configured): | $($(1)_dependencies) $($(1)_preprocessed)
echo Configuring $(1)... echo Configuring $(1)...
rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), $(build_TAR) --no-same-owner -xf $($(package)_cached); ) rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), $(build_TAR) --no-same-owner -xf $($(package)_cached); )
mkdir -p $$(@D) mkdir -p $$(@D)
+cd $$(@D); $($(1)_config_env) $(call $(1)_config_cmds, $(1)) +cd $$(@D); $($(1)_config_env) $($(1)_config_cmds)
touch $$@ touch $$@
$($(1)_built): | $($(1)_configured) $($(1)_built): | $($(1)_configured)
echo Building $(1)... echo Building $(1)...
mkdir -p $$(@D) mkdir -p $$(@D)
+cd $$(@D); $($(1)_build_env) $(call $(1)_build_cmds, $(1)) +cd $$(@D); $($(1)_build_env) $($(1)_build_cmds)
touch $$@ touch $$@
$($(1)_staged): | $($(1)_built) $($(1)_staged): | $($(1)_built)
echo Staging $(1)... echo Staging $(1)...
mkdir -p $($(1)_staging_dir)/$(host_prefix) mkdir -p $($(1)_staging_dir)/$(host_prefix)
cd $($(1)_build_dir); $($(1)_stage_env) $(call $(1)_stage_cmds, $(1)) cd $($(1)_build_dir); $($(1)_stage_env) $($(1)_stage_cmds)
rm -rf $($(1)_extract_dir) rm -rf $($(1)_extract_dir)
touch $$@ touch $$@
$($(1)_postprocessed): | $($(1)_staged) $($(1)_postprocessed): | $($(1)_staged)
echo Postprocessing $(1)... echo Postprocessing $(1)...
cd $($(1)_staging_prefix_dir); $(call $(1)_postprocess_cmds) cd $($(1)_staging_prefix_dir); $($(1)_postprocess_cmds)
touch $$@ touch $$@
$($(1)_cached): | $($(1)_dependencies) $($(1)_postprocessed) $($(1)_cached): | $($(1)_dependencies) $($(1)_postprocessed)
echo Caching $(1)... echo Caching $(1)...