MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-06 03:28:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'libtool-prefix' into 'master'

Browse Source 
Fix libtool init in prefix gcc

See merge request redox-os/redox!1807
This commit is contained in:
Jeremy Soller 2026-01-03 06:11:01 -07:00
commit 8095805863
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/podman.mk
View File

@ -57,12 +57,11 @@ container_kill: FORCE
## Must match the value of CONTAINER_TAG in config.mk ## Must match the value of CONTAINER_TAG in config.mk
build/container.tag: $(CONTAINERFILE) build/container.tag: $(CONTAINERFILE)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
rm -f build/container.tag rm -f $@ $(FSTOOLS_TAG)
-podman image rm --force $(IMAGE_TAG) || true -podman image rm --force $(IMAGE_TAG) || true
mkdir -p $(PODMAN_HOME) mkdir -p $(PODMAN_HOME)
@echo "Building Podman image. This may take some time." @echo "Building Podman image. This may take some time."
cat $(CONTAINERFILE) | podman build --file - $(PODMAN_VOLUMES) --tag $(IMAGE_TAG) cat $(CONTAINERFILE) | podman build --file - $(PODMAN_VOLUMES) --tag $(IMAGE_TAG)
@echo "Mapping Podman user space. Please wait."
$(PODMAN_RUN) bash -e podman/rustinstall.sh $(PODMAN_RUN) bash -e podman/rustinstall.sh
mkdir -p build mkdir -p build
touch $@ touch $@

13
mk/prefix.mk
View File

@ -70,6 +70,10 @@ else
export $(PREFIX_CONFIG) COOKBOOK_HOST_SYSROOT=/usr && \ export $(PREFIX_CONFIG) COOKBOOK_HOST_SYSROOT=/usr && \
./target/release/repo cook host:libtool ./target/release/repo cook host:libtool
cp -r "$(LIBTOOL_TARGET)/stage/usr/". "$@.partial" cp -r "$(LIBTOOL_TARGET)/stage/usr/". "$@.partial"
mv "$@.partial/bin/libtoolize" "$@.partial/bin/libtoolize.orig"
# adapt path for libtoolize
sed 's|/usr/share|$(ROOT)/$@/share|g' "$@.partial/bin/libtoolize.orig" > "$@.partial/bin/libtoolize"
chmod 0755 "$@.partial/bin/libtoolize"
touch "$@.partial" touch "$@.partial"
mv "$@.partial" "$@" mv "$@.partial" "$@"
endif endif
@ -82,7 +86,8 @@ else
cp -r "$(PREFIX)/relibc-install/" "$@" cp -r "$(PREFIX)/relibc-install/" "$@"
cp -r "$(PREFIX)/libtool-install/". "$@" cp -r "$(PREFIX)/libtool-install/". "$@"
# adapt path for libtoolize # adapt path for libtoolize
$(SED) -i 's|/usr/share|$(ROOT)/$@/share|g' "$@/bin/libtoolize" sed 's|/usr/share|$(ROOT)/$@/share|g' "$@/bin/libtoolize.orig" > "$@/bin/libtoolize"
chmod 0755 "$@/bin/libtoolize"
touch "$@" touch "$@"
endif endif
@ -127,15 +132,15 @@ else
mv "$@.partial" "$@" mv "$@.partial" "$@"
endif endif
$(PREFIX)/gcc-freestanding-install: $(PREFIX)/binutils-install | $(FSTOOLS_TAG) $(CONTAINER_TAG) $(PREFIX)/gcc-freestanding-install: $(PREFIX)/libtool-install $(PREFIX)/binutils-install | $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ $(PODMAN_RUN) make $@
else else
@echo "\033[1;36;49mBuilding gcc-freestanding-install\033[0m" @echo "\033[1;36;49mBuilding gcc-freestanding-install\033[0m"
rm -rf "$@.partial" "$@" $(PREFIX)/relibc-freestanding-install $(PREFIX)/sysroot rm -rf "$@.partial" "$@" $(PREFIX)/relibc-freestanding-install $(PREFIX)/sysroot
mkdir -p "$@.partial" $(PREFIX)/relibc-freestanding-install/$(GNU_TARGET)/include mkdir -p "$@.partial" $(PREFIX)/relibc-freestanding-install/$(GNU_TARGET)/include
export $(PREFIX_CONFIG) PATH="$(ROOT)/$(PREFIX)/binutils-install/bin:$$PATH" \ export $(PREFIX_CONFIG) PATH="$(ROOT)/$(PREFIX)/libtool-install/bin:$(ROOT)/$(PREFIX)/binutils-install/bin:$$PATH" \
COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) \ COOKBOOK_LIBTOOL_DIR=$(ROOT)/$(PREFIX)/libtool-install COOKBOOK_CROSS_TARGET=$(TARGET) COOKBOOK_CROSS_GNU_TARGET=$(GNU_TARGET) \
COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_SYSROOT=$(ROOT)/$(PREFIX)/relibc-freestanding-install/$(GNU_TARGET) && \ COOKBOOK_HOST_SYSROOT=/usr COOKBOOK_CROSS_SYSROOT=$(ROOT)/$(PREFIX)/relibc-freestanding-install/$(GNU_TARGET) && \
./target/release/repo cook host:gcc13 ./target/release/repo cook host:gcc13
cp -r "$(GCC_TARGET)/stage/usr/". "$@.partial" cp -r "$(GCC_TARGET)/stage/usr/". "$@.partial"

3
recipes/dev/gcc13/recipe.toml
View File

@ -5,7 +5,8 @@ shallow_clone = true
script = """ script = """
DYNAMIC_INIT DYNAMIC_INIT
COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)" COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)"
cp -fpv "${COOKBOOK_HOST_SYSROOT}"/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/ LIBTOOL_BUILD_AUX="${COOKBOOK_LIBTOOL_DIR:-$COOKBOOK_HOST_SYSROOT}"/share/libtool/build-aux
cp -fpv "$LIBTOOL_BUILD_AUX"/{config.sub,config.guess,install-sh} libiberty/
""" """
[build] [build]