From 0a849a1681d7185d360c8645dd4077a7fdffbf88 Mon Sep 17 00:00:00 2001 From: Tomasz Gajewski Date: Tue, 30 Mar 2021 21:53:13 +0200 Subject: [PATCH] prepare_port: cache handling for files with paths This patch is a follow-up fix for issue #4028 that fixes #4061. --- tool/ports/mk/install.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/ports/mk/install.mk b/tool/ports/mk/install.mk index c4501ce6ab..86969ab559 100644 --- a/tool/ports/mk/install.mk +++ b/tool/ports/mk/install.mk @@ -204,7 +204,7 @@ _file_name = $(call _prefer,$(NAME($1)),$(notdir $(URL($1)))) $(VERBOSE)test -n "$(URL($*))" ||\ ($(ECHO) "Error: Undefined URL for $(call _file_name,$*)"; false); $(VERBOSE)mkdir -p $(dir $(call _file_name,$*)) - $(VERBOSE)name=$(call _file_name,$*); cached_name=$(GENODE_CONTRIB_CACHE)/$(SHA($*))_$$name; \ + $(VERBOSE)name=$(call _file_name,$*); cached_name=$(GENODE_CONTRIB_CACHE)/$(SHA($*))_`basename $$name`; \ (test -f $$name || ! test -f $$cached_name || cp $$cached_name $$name); \ (test -f $$name || $(MSG_DOWNLOAD)$(URL($*))); \ (test -f $$name || wget --quiet --no-check-certificate $(URL($*)) -O $$name) || \ @@ -213,7 +213,7 @@ _file_name = $(call _prefer,$(NAME($1)),$(notdir $(URL($1)))) ($(ECHO) "$(SHA($*)) $(call _file_name,$*)" |\ sha256sum -c > /dev/null 2> /dev/null) || \ ($(ECHO) Error: Hash sum check for $* failed; false) - $(VERBOSE)name=$(call _file_name,$*); cached_name=$(GENODE_CONTRIB_CACHE)/$(SHA($*))_$$name; \ + $(VERBOSE)name=$(call _file_name,$*); cached_name=$(GENODE_CONTRIB_CACHE)/$(SHA($*))_`basename $$name`; \ mkdir -p $(GENODE_CONTRIB_CACHE); \ (test -f $$cached_name || (cp $$name $$cached_name.tmp && mv $$cached_name.tmp $$cached_name))