Merge branch 'dynamic_linking' into 'master'

fix(libtool): correct ltversion

See merge request redox-os/redox!1530
This commit is contained in:
Jeremy Soller 2024-12-20 14:25:52 +00:00
commit 0be6bddbb8

View file

@ -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" && \
--gnulib-srcdir=./gnulib && \
"$(ROOT)/$</configure" \
--target="$(TARGET)" \
--prefix=$(abspath $(PREFIX)/sysroot) \
&& \
--prefix=$(abspath $(PREFIX)/sysroot) && \
$(MAKE) -j `$(NPROC)`
touch "$@.partial"
mv "$@.partial" "$@"
endif