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

Try not to build fallback packages unless necessary.

Browse Source
This commit is contained in:
David Given
2024-03-31 21:30:26 +02:00
parent cdf9cc387c
commit 621523db62
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/pkg.py
View File

@@ -16,9 +16,6 @@ HOST_PACKAGES := $(shell $(HOST_PKG_CONFIG) --list-all | cut -d' ' -f1 | sort)
@Rule @Rule
def package(self, name, package=None, fallback: Target = None): def package(self, name, package=None, fallback: Target = None):
self.ins = []
self.outs = []
emit("ifeq ($(filter %s, $(PACKAGES)),)" % package) emit("ifeq ($(filter %s, $(PACKAGES)),)" % package)
if fallback: if fallback:
emit( emit(
@@ -29,7 +26,7 @@ def package(self, name, package=None, fallback: Target = None):
f"PACKAGE_LDFLAGS_{package} := ", f"PACKAGE_LDFLAGS_{package} := ",
bubbledattrsof(fallback, "caller_ldflags"), bubbledattrsof(fallback, "caller_ldflags"),
) )
self.outs = filenamesof(fallback) emit(f"PACKAGE_DEPS_{package} := ", filenamesof(fallback))
else: else:
emit(f"$(error Required package '{package}' not installed.)") emit(f"$(error Required package '{package}' not installed.)")
emit("else") emit("else")
@@ -39,6 +36,7 @@ def package(self, name, package=None, fallback: Target = None):
emit( emit(
f"PACKAGE_LDFLAGS_{package} := $(shell $(PKG_CONFIG) --libs {package})" f"PACKAGE_LDFLAGS_{package} := $(shell $(PKG_CONFIG) --libs {package})"
) )
emit(f"PACKAGE_DEPS_{package} :=")
emit("endif") emit("endif")
self.attr.caller_cflags = [f"$(PACKAGE_CFLAGS_{package})"] self.attr.caller_cflags = [f"$(PACKAGE_CFLAGS_{package})"]
@@ -46,6 +44,9 @@ def package(self, name, package=None, fallback: Target = None):
self.traits.add("clibrary") self.traits.add("clibrary")
self.traits.add("cheaders") self.traits.add("cheaders")
self.ins = []
self.outs = [f"$(PACKAGE_DEPS_{package})"]
@Rule @Rule
def hostpackage(self, name, package=None, fallback: Target = None): def hostpackage(self, name, package=None, fallback: Target = None):