salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-24 11:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pull the .a file out of fallback targets at make time, not at config time.

Browse Source
This commit is contained in:
David Given
2024-03-31 21:53:40 +02:00
parent 72ab957134
commit 1a612c3db5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/pkg.py
View File

@@ -18,6 +18,7 @@ HOST_PACKAGES := $(shell $(HOST_PKG_CONFIG) --list-all | cut -d' ' -f1 | sort)
def package(self, name, package=None, fallback: Target = None):
emit("ifeq ($(filter %s, $(PACKAGES)),)" % package)
if fallback:
emit(f"PACKAGE_DEPS_{package} := ", filenamesof(fallback))
emit(
f"PACKAGE_CFLAGS_{package} :=",
bubbledattrsof(fallback, "caller_cflags"),
@@ -25,8 +26,8 @@ def package(self, name, package=None, fallback: Target = None):
emit(
f"PACKAGE_LDFLAGS_{package} := ",
bubbledattrsof(fallback, "caller_ldflags"),
f"$(filter %.a, $(PACKAGE_DEPS_{package})",
)
emit(f"PACKAGE_DEPS_{package} := ", filenamesof(fallback))
else:
emit(f"$(error Required package '{package}' not installed.)")
emit("else")