diff --git a/mk/repo.mk b/mk/repo.mk index 16c0112..c04cf76 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -1,11 +1,14 @@ # Configuration file for recipe commands +PREFER_STATIC?= + $(BUILD)/fetch.tag: prefix $(FSTOOLS_TAG) $(FILESYSTEM_CONFIG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ + $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) else PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ + export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./fetch.sh "$${PACKAGES}" mkdir -p $(BUILD) @@ -14,10 +17,11 @@ endif $(REPO_TAG): $(BUILD)/fetch.tag $(FSTOOLS_TAG) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ + $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ + export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \ cd cookbook && \ ./repo.sh $(REPO_NONSTOP) "$${PACKAGES}" @@ -31,10 +35,11 @@ endif # Invoke clean.sh for a single target c.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ + $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ + export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./clean.sh $* endif @@ -42,10 +47,11 @@ endif # Invoke fetch.sh for a single target f.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ + $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ + export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./fetch.sh $* endif @@ -53,10 +59,11 @@ endif # Invoke repo.sh for a single target r.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ + $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ + export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./repo.sh $* endif @@ -64,10 +71,11 @@ endif # Invoke unfetch.sh for a single target u.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) - $(PODMAN_RUN) $(MAKE) $@ + $(PODMAN_RUN) $(MAKE) $@ PREFER_STATIC=$(PREFER_STATIC) else export PATH="$(PREFIX_PATH):$$PATH" && \ export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \ + export COOKBOOK_PREFER_STATIC="$(PREFER_STATIC)" && \ cd cookbook && \ ./unfetch.sh $* endif