From 9a3866e758e7cdefaa6876ce11ffa760e3fb5510 Mon Sep 17 00:00:00 2001
From: zinzaguras <maxis1191@gmail.com>
Date: Thu, 8 May 2025 21:20:32 +0300
Subject: [PATCH] Fix non podman build.

1. Export version for libtool cause some packages checks for it;
2. Set PATH variable to include redox toolchain before sysroot been created,
as it's required by libtool and relibc.
---
 mk/prefix.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 25aba56e4..09692c736 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -82,6 +82,7 @@ $(PREFIX)/libtool:
 		"$@.partial"
 
 	touch "$@.partial"
+	echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version
 	mv "$@.partial" "$@"
 
 $(PREFIX)/libtool-build: $(PREFIX)/libtool $(CONTAINER_TAG)
@@ -89,11 +90,13 @@ ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
 	mkdir -p "$@.partial"
+	PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \
 	cd "$<" && \
 		./bootstrap \
 			--skip-po \
 			--force \
 			--gnulib-srcdir=./gnulib
+	PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \
 	cd "$@.partial" && \
 		cp -rp $(abspath $<)/. ./ && \
 		"$(ROOT)/$</configure" \
@@ -110,6 +113,7 @@ ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
 	cp -r "$(PREFIX)/relibc-install/" "$@"
+	PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \
 	cd "$(PREFIX)/libtool-build" && \
 		$(MAKE) install -j `$(NPROC)`
 	cd "$@" && $(PREFIX_STRIP)