diff --git a/mk/prefix.mk b/mk/prefix.mk index 8743386d9..4019d669f 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -70,21 +70,19 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/relibc-install --directory="$<" \ . -$(PREFIX)/libtool: +$(PREFIX)/libtool: $(PREFIX)/libtool.tar.gz rm -rf "$@.partial" "$@" mkdir -p "$@.partial" - - git clone \ - --recurse-submodules \ - "https://gitlab.redox-os.org/redox-os/libtool/" \ - --branch "v$(LIBTOOL_VERSION)-redox" \ - --depth 2 \ - "$@.partial" - + tar --extract --file "$<" --directory "$@.partial" --strip-components=1 touch "$@.partial" echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version mv "$@.partial" "$@" +$(PREFIX)/libtool.tar.gz: + mkdir -p "$(@D)" + wget -O $@.partial "https://gitlab.redox-os.org/redox-os/libtool/-/archive/v$(LIBTOOL_VERSION)-redox/libtool-v$(LIBTOOL_VERSION)-redox.tar.gz" + mv $@.partial $@ + $(PREFIX)/libtool-build: $(PREFIX)/libtool $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) make $@ @@ -98,7 +96,7 @@ else --gnulib-srcdir=./gnulib PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \ cd "$@.partial" && \ - cp -rp $(abspath $<)/. ./ && \ + cp -r $(abspath $<)/. ./ && \ "$(ROOT)/$