Skip to content

Commit 8e07d33

Browse files
committed
merge bitcoin#33494: Update URL for qrencode package source tarball
1 parent 3dd5c1c commit 8e07d33

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

depends/funcs.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ define fetch_file_inner
3434
endef
3535

3636
define fetch_file
37-
( test -f $$($(1)_source_dir)/$(4) || \
3837
( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \
39-
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5))))
38+
$(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))
4039
endef
4140

4241
define int_get_build_recipe_hash
@@ -70,7 +69,7 @@ $(1)_build_log:=$(BASEDIR)/$(1)-$($(1)_version)-$($(1)_build_id).log
7069
$(1)_all_sources=$($(1)_file_name) $($(1)_extra_sources)
7170

7271
#stamps
73-
$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_file_name).hash
72+
$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_version)-$($(1)_sha256_hash).hash
7473
$(1)_extracted=$$($(1)_extract_dir)/.stamp_extracted
7574
$(1)_preprocessed=$$($(1)_extract_dir)/.stamp_preprocessed
7675
$(1)_cleaned=$$($(1)_extract_dir)/.stamp_cleaned
@@ -206,7 +205,6 @@ endif
206205
$($(1)_fetched):
207206
mkdir -p $$(@D) $(SOURCES_PATH)
208207
rm -f $$@
209-
touch $$@
210208
cd $$(@D); $($(1)_fetch_cmds)
211209
cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);)
212210
touch $$@

depends/packages/qrencode.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package=qrencode
22
$(package)_version=4.1.1
3-
$(package)_download_path=https://fukuchi.org/works/qrencode/
3+
$(package)_download_path=https://github.com/fukuchi/libqrencode/archive/refs/tags/
4+
$(package)_download_file=v$($(package)_version).tar.gz
45
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5-
$(package)_sha256_hash=da448ed4f52aba6bcb0cd48cac0dd51b8692bccc4cd127431402fca6f8171e8e
6+
$(package)_sha256_hash=5385bc1b8c2f20f3b91d258bf8ccc8cf62023935df2d2676b5b67049f31a049c
67
$(package)_patches=cmake_fixups.patch
78

89
define $(package)_set_vars

0 commit comments

Comments
 (0)