MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-06 04:27:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

prefix: Allow unprefixed autoreconf with version check

Browse Source
This commit is contained in:
Wildan M 2026-08-26 10:25:53 +07:00
parent fa07a456ee
commit 4fed741db6
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/prefix.mk
View File

@ -412,7 +412,7 @@ else
# TODO: Cache from WASIP1_LIBC_TARGET is currently not cleared.
endif
$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
$(PREFIX)/rust-install: | $(PREFIX)/wasip1-libc-install $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
@ -431,7 +431,7 @@ endif
endif
# BUILD CLANG ---------------------------------------------------
$(PREFIX)/clang-install: | $(PREFIX)/libtool-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
$(PREFIX)/clang-install: | $(PREFIX)/gcc-install $(FSTOOLS_TAG) $(CONTAINER_TAG)
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else

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

@ -4,7 +4,12 @@ branch = "redox-13.2.0"
shallow_clone = true
script = """
DYNAMIC_INIT
COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)"
export COOKBOOK_AUTORECONF=$(
command -v autoreconf2.69 2>/dev/null || \\
(autoreconf --version 2>/dev/null | grep -q '2\\.69' && command -v autoreconf) || \\
(echo "Error: Autoconf 2.69 required" >&2; exit 1)
)
autotools_recursive_regenerate -I"$(realpath ./config)"
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/
cp -fpv "$LIBTOOL_BUILD_AUX"/{config.sub,config.guess,install-sh} zlib/contrib/minizip/

8
recipes/tools/gnu-binutils/recipe.toml
View File

@ -4,8 +4,12 @@ blake3 = "f074c81313b70eabc58ce9a9411cd771c5fa2433792d0ad8abcc45f603f58ed6"
patches = ["01_build_fix.patch"]
script = """
DYNAMIC_INIT
COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)"
export COOKBOOK_AUTORECONF=$(
command -v autoreconf2.69 2>/dev/null || \\
(autoreconf --version 2>/dev/null | grep -q '2\\.69' && command -v autoreconf) || \\
(echo "Error: Autoconf 2.69 required" >&2; exit 1)
)
autotools_recursive_regenerate -I"$(realpath ./config)"
cp -fpv ${COOKBOOK_HOST_SYSROOT}/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/
"""