mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-01 17:18:46 +08:00
Revert some changes and remove osxfuse in podman deps
This commit is contained in:
parent
1c93c89f38
commit
0e232a7909
15
mk/prefix.mk
15
mk/prefix.mk
@ -70,7 +70,7 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/relibc-install
|
||||
--directory="$<" \
|
||||
.
|
||||
|
||||
$(PREFIX)/libtool: $(PREFIX)/libtool.tar.gz
|
||||
$(PREFIX)/libtool:
|
||||
rm -rf "$@.partial" "$@"
|
||||
mkdir -p "$@.partial"
|
||||
|
||||
@ -82,6 +82,8 @@ $(PREFIX)/libtool: $(PREFIX)/libtool.tar.gz
|
||||
--depth 2 \
|
||||
"$@.partial"
|
||||
|
||||
# rootless podman problem
|
||||
chmod -R u+w $@.partial
|
||||
touch "$@.partial"
|
||||
echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version
|
||||
mv "$@.partial" "$@"
|
||||
@ -134,16 +136,7 @@ $(PREFIX)/rust-install.tar.gz:
|
||||
$(PREFIX)/rust-install: $(PREFIX)/rust-install.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"
|
||||
|
||||
# rootless podman problem
|
||||
chmod -R u+w $@.partial
|
||||
tar --extract --file "$<" --directory "$@.partial" --strip-components=1
|
||||
touch "$@.partial"
|
||||
mv "$@.partial" "$@"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user