janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions

ldlibpath.mk: Replace ifndef by ifeq ($(origin, ...))

Browse source 
As per info make, it turns out that ifndef SOME_VAR is true for
SOME_VAR defined to an empty value. This is unusable for caching, so
replace it with ifeq ($(origin SOME_VAR),undefined).

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-01-28 15:19:07 +01:00
commit 1154cb984c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/ldlibpath.mk
View file

@ -2,7 +2,7 @@
# -- LD_LIBRARY_PATH # -- LD_LIBRARY_PATH
LD_LIBRARY_PATH_ENV = $(shell echo $(FINAL_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') LD_LIBRARY_PATH_ENV = $(shell echo $(FINAL_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
ifndef JW_PKG_LD_LIBRARY_PATH ifeq ($(origin JW_PKG_LD_LIBRARY_PATH),undefined)
JW_PKG_LD_LIBRARY_PATH := $(call proj_query, ldlibpath $(PROJECT) $(PREREQ_BUILD)) JW_PKG_LD_LIBRARY_PATH := $(call proj_query, ldlibpath $(PROJECT) $(PREREQ_BUILD))
endif endif
export LD_LIBRARY_PATH := $(JW_PKG_LD_LIBRARY_PATH) export LD_LIBRARY_PATH := $(JW_PKG_LD_LIBRARY_PATH)
@ -12,14 +12,14 @@ endif
# -- PATH # -- PATH
EXE_SEARCH_PATH_ENV := $(PATH) EXE_SEARCH_PATH_ENV := $(PATH)
ifndef JW_PKG_EXE_PATH ifeq ($(origin JW_PKG_EXE_PATH),undefined)
JW_PKG_EXE_PATH := $(call proj_query, exepath $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV) JW_PKG_EXE_PATH := $(call proj_query, exepath $(PROJECT) $(PREREQ_BUILD)):$(EXE_SEARCH_PATH_ENV)
endif endif
export PATH := $(JW_PKG_EXE_PATH) export PATH := $(JW_PKG_EXE_PATH)
# -- PYTHONPATH # -- PYTHONPATH
PYTHONPATH_ENV := $(PYTHONPATH) PYTHONPATH_ENV := $(PYTHONPATH)
ifndef JW_PKG_PYTHON_PATH ifeq ($(origin JW_PKG_PYTHON_PATH),undefined)
JW_PKG_PYTHON_PATH := $(call proj_query, pythonpath $(PROJECT)) JW_PKG_PYTHON_PATH := $(call proj_query, pythonpath $(PROJECT))
endif endif
export PYTHONPATH := $(JW_PKG_PYTHON_PATH) export PYTHONPATH := $(JW_PKG_PYTHON_PATH)