From f8d2c7ed4b65aa901897525b8fc24dc50d621f82 Mon Sep 17 00:00:00 2001
From: Anhad Singh <andypython@protonmail.com>
Date: Sat, 21 Dec 2024 01:09:52 +1100
Subject: [PATCH] fix(mk/prefix.mk): correct ltversion

The script `build-aux/git-version-gen` needs sufficient depth to
correctly determine the version. Also it has to be in tree, otherwise
the version is reported as 'UNKNOWN', breaking some packages.

Signed-off-by: Anhad Singh <andypython@protonmail.com>
---
 mk/prefix.mk | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 3bf9b10..d89c02c 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -78,7 +78,7 @@ $(PREFIX)/libtool:
 		--recurse-submodules \
 		"https://gitlab.redox-os.org/andypython/libtool/" \
 		--branch "v$(LIBTOOL_VERSION)-redox" \
-		--depth 1 \
+		--depth 2 \
 		"$@.partial"
 
 	touch "$@.partial"
@@ -89,18 +89,17 @@ ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
 	mkdir -p "$@.partial"
-	cd "$(PREFIX)/libtool" && \
+	cd "$@.partial" && \
+		cp -rp $(abspath $(PREFIX)/libtool)/. ./ && \
 		./bootstrap \
 			--skip-po \
-			--skip-git \
 			--force \
-			--gnulib-srcdir=./gnulib
-	cd "$@.partial" && \
-	"$(ROOT)/$</configure" \
-		--target="$(TARGET)" \
-		--prefix=$(abspath $(PREFIX)/sysroot) \
-		&& \
-	$(MAKE) -j `$(NPROC)`
+			--gnulib-srcdir=./gnulib && \
+		"$(ROOT)/$</configure" \
+			--target="$(TARGET)" \
+			--prefix=$(abspath $(PREFIX)/sysroot) && \
+		$(MAKE) -j `$(NPROC)`
+
 	touch "$@.partial"
 	mv "$@.partial" "$@"
 endif