janware/jw-pkg
1
Code Pull requests Activity Actions

py-path|ldlibpath.mk: Space-separate JW_PKG_XXX_PATH
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 3m45s
Details
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 3m31s
Details
CI / Packaging test (pull_request) Successful in 0s
Details
CI / Packaging - Kali Linux (push) Successful in 3m10s
Details
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 3m1s
Details
CI / Packaging test (push) Successful in 0s
Details

Browse source 
The following variables contain colons as path-separators:
- JW_PKG_PYTHON_PATH - JW_PKG_EXE_PATH - JW_PKG_LD_LIBRARY_PATH
This commit makes them use spaces instead, so they can be  more easily amended by Makefiles using them. Also define them in a more uniform way, and use the newly introduced PREREQ_RUN variable to fill them, which in turn can also be appended to before that.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-06-17 14:10:44 +02:00
commit 156d073885
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/ldlibpath.mk
View file

@ -3,18 +3,18 @@
# -- LD_LIBRARY_PATH
LD_LIBRARY_PATH_ENV = $(shell echo $(FINAL_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
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 --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
endif
export LD_LIBRARY_PATH := $(JW_PKG_LD_LIBRARY_PATH)
export LD_LIBRARY_PATH := $(subst $(space),:,$(JW_PKG_LD_LIBRARY_PATH)):$(LD_LIBRARY_PATH_ENV)
ifeq ($(TARGET),mingw)
DLL_PATH = $(shell echo $(LD_LIBRARY_PATH) | $(SED) 's/:/;/g');$(CROSS_TOOL_DIR)/bin
DLL_PATH = $(subst :,;,$(LD_LIBRARY_PATH));$(CROSS_TOOL_DIR)/bin
endif
# -- PATH
EXE_SEARCH_PATH_ENV := $(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 --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
endif
export PATH := $(JW_PKG_EXE_PATH)
export PATH := $(subst $(space),:,$(JW_PKG_EXE_PATH)):$(EXE_SEARCH_PATH_ENV)
include $(JWBDIR)/make/py-path.mk

5
make/py-path.mk
View file

@ -1,6 +1,7 @@
# -- PYTHONPATH
PYTHONPATH_ENV := $(PYTHONPATH)
JW_PKG_PYTHON_PATH_PREREQ += $(PROJECT)
ifeq ($(origin JW_PKG_PYTHON_PATH),undefined)
JW_PKG_PYTHON_PATH := $(call proj_query, pythonpath $(PROJECT))
JW_PKG_PYTHON_PATH := $(shell $(JW_PKG_PY) --topdir-format absolute projects pythonpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
endif
export PYTHONPATH := $(JW_PKG_PYTHON_PATH)
export PYTHONPATH := $(subst $(space),:,$(JW_PKG_PYTHON_PATH))