mirror of
https://git.freebsd.org/ports.git
synced 2025-05-16 17:21:49 -04:00
7d4723292c
Some changes have been made in this release that break backwards compatibility. Let USES=gmake force users to upgrade to this version so port maintainers don't have to support older versions. PR: 245725 Exp-run by: antoine Approved by: portmgr (antoine)
25 lines
1.2 KiB
Text
25 lines
1.2 KiB
Text
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
|
|
index 8de519fc606..221e9455960 100644
|
|
--- make/common/MakeBase.gmk
|
|
+++ make/common/MakeBase.gmk
|
|
@@ -525,15 +525,16 @@ DependOnVariableFileName = \
|
|
# Param 2 - (optional) name of file to store value in
|
|
DependOnVariableHelper = \
|
|
$(strip \
|
|
- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
|
|
+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
|
|
+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
|
|
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
|
|
- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
|
|
+ $(call MakeDir, $(dir $($1_filename))) \
|
|
$(if $(findstring $(LOG_LEVEL), trace), \
|
|
$(info NewVariable $1: >$(strip $($1))<) \
|
|
$(info OldVariable $1: >$(strip $($1_old))<)) \
|
|
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
|
|
- $(call DependOnVariableFileName, $1, $2))) \
|
|
- $(call DependOnVariableFileName, $1, $2) \
|
|
+ $($1_filename))) \
|
|
+ $($1_filename) \
|
|
)
|
|
|
|
# Main macro
|