vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dynamic_linking' into 'master'

Browse source 
fear(repo.mk): PREFER_STATIC

See merge request redox-os/redox!1540
This commit is contained in:
Jeremy Soller 2025-01-20 19:55:22 +00:00
parent 8bce4659df cd911d16df
commit 2e8196ae5e
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mk/repo.mk
View file

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