marvin.weiler/musl-cross-make
1
0
Fork 0
mirror of https://github.com/richfelker/musl-cross-make.git synced 2025-04-19 23:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: archive dont del source file

Browse Source
This commit is contained in:
zijiren233 2024-01-10 22:35:05 +08:00
parent 70344021c7
commit ed52296c71
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -56,6 +56,13 @@ clean:
distclean: clean distclean: clean
rm -rf sources rm -rf sources
check:
@echo "check bzip2"
@which bzip2
@echo "check gcc"
@which gcc
@echo "check libtool"
@which libtool
# Rules for downloading and verifying sources. Treat an external SOURCES path as # Rules for downloading and verifying sources. Treat an external SOURCES path as
# immutable and do not try to download anything into it. # immutable and do not try to download anything into it.
@ -112,7 +119,7 @@ musl-git-%:
case "$@" in */*) exit 1 ;; esac case "$@" in */*) exit 1 ;; esac
rm -rf $@.tmp rm -rf $@.tmp
mkdir $@.tmp mkdir $@.tmp
( cd $@.tmp && tar zxvf - ) < $< ( cd $@.tmp && tar -zxvf - ) < $<
rm -rf $@ rm -rf $@
touch $@.tmp/$(patsubst %.orig,%,$@) touch $@.tmp/$(patsubst %.orig,%,$@)
mv $@.tmp/$(patsubst %.orig,%,$@) $@ mv $@.tmp/$(patsubst %.orig,%,$@) $@
@ -122,7 +129,7 @@ musl-git-%:
case "$@" in */*) exit 1 ;; esac case "$@" in */*) exit 1 ;; esac
rm -rf $@.tmp rm -rf $@.tmp
mkdir $@.tmp mkdir $@.tmp
( cd $@.tmp && tar jxvf - ) < $< ( cd $@.tmp && tar -jxvf - ) < $<
rm -rf $@ rm -rf $@
touch $@.tmp/$(patsubst %.orig,%,$@) touch $@.tmp/$(patsubst %.orig,%,$@)
mv $@.tmp/$(patsubst %.orig,%,$@) $@ mv $@.tmp/$(patsubst %.orig,%,$@) $@
@ -132,7 +139,7 @@ musl-git-%:
case "$@" in */*) exit 1 ;; esac case "$@" in */*) exit 1 ;; esac
rm -rf $@.tmp rm -rf $@.tmp
mkdir $@.tmp mkdir $@.tmp
( cd $@.tmp && tar Jxvf - ) < $< ( cd $@.tmp && tar -Jxvf - ) < $<
rm -rf $@ rm -rf $@
touch $@.tmp/$(patsubst %.orig,%,$@) touch $@.tmp/$(patsubst %.orig,%,$@)
mv $@.tmp/$(patsubst %.orig,%,$@) $@ mv $@.tmp/$(patsubst %.orig,%,$@) $@

1
scripts/build.sh
View File

@ -59,7 +59,6 @@ function Build() {
exit 1 exit 1
fi fi
if [ ! "$TEST_BUILD_ONLY" ]; then if [ ! "$TEST_BUILD_ONLY" ]; then
rm -rf output/${TARGET}
tar -zcvf ${DIST}/${TARGET}.tgz output/* tar -zcvf ${DIST}/${TARGET}.tgz output/*
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "package ${TARGET} error" echo "package ${TARGET} error"