janware/jw-pkg
1
Code Pull requests Activity Actions
jw-pkg/make/ldlibpath.mk

20 lines
901 B
Makefile
Raw Permalink Normal View History

make/[Makefile|*.mk): Improve variable caching This commit aims at improving speed by using better caching. - Makefile, cache.mk: Split .cache.mk up To allow caching of runtime path variables which are project-specific, split .cache.mk up in .cache-project.mk and .cache-projects.mk - ldlibpath.mk: Cache ldlibpath, exepath and pythonpath Place the output of $(call proj_query ldlibpath), $(call proj_query, exepath) and $(call proj_query pythonpath) in JW_PKG_LD_LIBRARY_PATH, JW_PKG_EXE_PATH, and JW_PKG_PYTHON_PATH respectively, and cache the variables in make/.project-cache.mk. - cache.mk: Use = instead of := Recursively expanded variables are nearly as fast as := variables if the assigned value is a fixed string. And sometimes it's not, rightly so, because variables get assigned below, as with JW_PKG_XXX for instance. - cache.mk: Use $(TOPDIR) as variable values Replace absolute references to project's topdir by $(TOPDIR) with sed. As soon as the project queries produce absolute paths, they will be transformed into relative paths which allow the code base to be moved to a different location and still remain functional without a rebuild. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-22 14:12:58 +01:00
# == System environment variables
make: Re-add files necessary for building jw-python Re-add everything necessary for building and packaging jw-python. ldlibpath.mk is not strictly necessary, but might be with other Python packages backed by compiled C-code, so leave it in. Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-13 17:27:14 +01:00
make/[Makefile|*.mk): Improve variable caching This commit aims at improving speed by using better caching. - Makefile, cache.mk: Split .cache.mk up To allow caching of runtime path variables which are project-specific, split .cache.mk up in .cache-project.mk and .cache-projects.mk - ldlibpath.mk: Cache ldlibpath, exepath and pythonpath Place the output of $(call proj_query ldlibpath), $(call proj_query, exepath) and $(call proj_query pythonpath) in JW_PKG_LD_LIBRARY_PATH, JW_PKG_EXE_PATH, and JW_PKG_PYTHON_PATH respectively, and cache the variables in make/.project-cache.mk. - cache.mk: Use = instead of := Recursively expanded variables are nearly as fast as := variables if the assigned value is a fixed string. And sometimes it's not, rightly so, because variables get assigned below, as with JW_PKG_XXX for instance. - cache.mk: Use $(TOPDIR) as variable values Replace absolute references to project's topdir by $(TOPDIR) with sed. As soon as the project queries produce absolute paths, they will be transformed into relative paths which allow the code base to be moved to a different location and still remain functional without a rebuild. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-22 14:12:58 +01:00
# -- LD_LIBRARY_PATH
LD_LIBRARY_PATH_ENV = $(shell echo $(FINAL_LDFLAGS) | $(SED) 's/^-[^L] *[^ ]*/ /g; s/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
ldlibpath.mk: Replace ifndef by ifeq ($(origin, ...)) 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>
2026-01-28 15:19:07 +01:00
ifeq ($(origin JW_PKG_LD_LIBRARY_PATH),undefined)
py-path|ldlibpath.mk: Space-separate JW_PKG_XXX_PATH 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>
2026-06-17 14:10:44 +02:00
JW_PKG_LD_LIBRARY_PATH := $(call proj_query, ldlibpath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
make/[Makefile|*.mk): Improve variable caching This commit aims at improving speed by using better caching. - Makefile, cache.mk: Split .cache.mk up To allow caching of runtime path variables which are project-specific, split .cache.mk up in .cache-project.mk and .cache-projects.mk - ldlibpath.mk: Cache ldlibpath, exepath and pythonpath Place the output of $(call proj_query ldlibpath), $(call proj_query, exepath) and $(call proj_query pythonpath) in JW_PKG_LD_LIBRARY_PATH, JW_PKG_EXE_PATH, and JW_PKG_PYTHON_PATH respectively, and cache the variables in make/.project-cache.mk. - cache.mk: Use = instead of := Recursively expanded variables are nearly as fast as := variables if the assigned value is a fixed string. And sometimes it's not, rightly so, because variables get assigned below, as with JW_PKG_XXX for instance. - cache.mk: Use $(TOPDIR) as variable values Replace absolute references to project's topdir by $(TOPDIR) with sed. As soon as the project queries produce absolute paths, they will be transformed into relative paths which allow the code base to be moved to a different location and still remain functional without a rebuild. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-22 14:12:58 +01:00
endif
py-path|ldlibpath.mk: Space-separate JW_PKG_XXX_PATH 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>
2026-06-17 14:10:44 +02:00
export LD_LIBRARY_PATH := $(subst $(space),:,$(JW_PKG_LD_LIBRARY_PATH)):$(LD_LIBRARY_PATH_ENV)
make: Re-add files necessary for building jw-python Re-add everything necessary for building and packaging jw-python. ldlibpath.mk is not strictly necessary, but might be with other Python packages backed by compiled C-code, so leave it in. Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-13 17:27:14 +01:00
ifeq ($(TARGET),mingw)
py-path|ldlibpath.mk: Space-separate JW_PKG_XXX_PATH 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>
2026-06-17 14:10:44 +02:00
DLL_PATH = $(subst :,;,$(LD_LIBRARY_PATH));$(CROSS_TOOL_DIR)/bin
make: Re-add files necessary for building jw-python Re-add everything necessary for building and packaging jw-python. ldlibpath.mk is not strictly necessary, but might be with other Python packages backed by compiled C-code, so leave it in. Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-13 17:27:14 +01:00
endif
make/[Makefile|*.mk): Improve variable caching This commit aims at improving speed by using better caching. - Makefile, cache.mk: Split .cache.mk up To allow caching of runtime path variables which are project-specific, split .cache.mk up in .cache-project.mk and .cache-projects.mk - ldlibpath.mk: Cache ldlibpath, exepath and pythonpath Place the output of $(call proj_query ldlibpath), $(call proj_query, exepath) and $(call proj_query pythonpath) in JW_PKG_LD_LIBRARY_PATH, JW_PKG_EXE_PATH, and JW_PKG_PYTHON_PATH respectively, and cache the variables in make/.project-cache.mk. - cache.mk: Use = instead of := Recursively expanded variables are nearly as fast as := variables if the assigned value is a fixed string. And sometimes it's not, rightly so, because variables get assigned below, as with JW_PKG_XXX for instance. - cache.mk: Use $(TOPDIR) as variable values Replace absolute references to project's topdir by $(TOPDIR) with sed. As soon as the project queries produce absolute paths, they will be transformed into relative paths which allow the code base to be moved to a different location and still remain functional without a rebuild. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-22 14:12:58 +01:00
# -- PATH
EXE_SEARCH_PATH_ENV := $(PATH)
ldlibpath.mk: Replace ifndef by ifeq ($(origin, ...)) 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>
2026-01-28 15:19:07 +01:00
ifeq ($(origin JW_PKG_EXE_PATH),undefined)
py-path|ldlibpath.mk: Space-separate JW_PKG_XXX_PATH 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>
2026-06-17 14:10:44 +02:00
JW_PKG_EXE_PATH := $(call proj_query, exepath --delimiter ' ' $(PROJECT) $(PREREQ_RUN))
make/[Makefile|*.mk): Improve variable caching This commit aims at improving speed by using better caching. - Makefile, cache.mk: Split .cache.mk up To allow caching of runtime path variables which are project-specific, split .cache.mk up in .cache-project.mk and .cache-projects.mk - ldlibpath.mk: Cache ldlibpath, exepath and pythonpath Place the output of $(call proj_query ldlibpath), $(call proj_query, exepath) and $(call proj_query pythonpath) in JW_PKG_LD_LIBRARY_PATH, JW_PKG_EXE_PATH, and JW_PKG_PYTHON_PATH respectively, and cache the variables in make/.project-cache.mk. - cache.mk: Use = instead of := Recursively expanded variables are nearly as fast as := variables if the assigned value is a fixed string. And sometimes it's not, rightly so, because variables get assigned below, as with JW_PKG_XXX for instance. - cache.mk: Use $(TOPDIR) as variable values Replace absolute references to project's topdir by $(TOPDIR) with sed. As soon as the project queries produce absolute paths, they will be transformed into relative paths which allow the code base to be moved to a different location and still remain functional without a rebuild. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-22 14:12:58 +01:00
endif
py-path|ldlibpath.mk: Space-separate JW_PKG_XXX_PATH 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>
2026-06-17 14:10:44 +02:00
export PATH := $(subst $(space),:,$(JW_PKG_EXE_PATH)):$(EXE_SEARCH_PATH_ENV)
make/[Makefile|*.mk): Improve variable caching This commit aims at improving speed by using better caching. - Makefile, cache.mk: Split .cache.mk up To allow caching of runtime path variables which are project-specific, split .cache.mk up in .cache-project.mk and .cache-projects.mk - ldlibpath.mk: Cache ldlibpath, exepath and pythonpath Place the output of $(call proj_query ldlibpath), $(call proj_query, exepath) and $(call proj_query pythonpath) in JW_PKG_LD_LIBRARY_PATH, JW_PKG_EXE_PATH, and JW_PKG_PYTHON_PATH respectively, and cache the variables in make/.project-cache.mk. - cache.mk: Use = instead of := Recursively expanded variables are nearly as fast as := variables if the assigned value is a fixed string. And sometimes it's not, rightly so, because variables get assigned below, as with JW_PKG_XXX for instance. - cache.mk: Use $(TOPDIR) as variable values Replace absolute references to project's topdir by $(TOPDIR) with sed. As soon as the project queries produce absolute paths, they will be transformed into relative paths which allow the code base to be moved to a different location and still remain functional without a rebuild. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-22 14:12:58 +01:00
py-path.mk: Add file Aside from PYTHONPATH, ldlibpath.mk runs jw-pkg.py for determining other paths, too, which is often unneeded and can impact performance. Split the PYTHONPATH detection into a dedicated py-path.mk, and include it from ldlibpath.mk, so it can be used instead where needed. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-06-13 04:49:20 +02:00
include $(JWBDIR)/make/py-path.mk
Copy permalink