marvin.weiler
/
musl-cross-make
mirror of https://github.com/richfelker/musl-cross-make.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move config.sub dependency to patched source trees instead of orig ones 

this was overlooked when cowpatch was introduced.
This commit is contained in:
Rich Felker 2020-01-22 17:26:56 -05:00
parent 8a92c5230c
commit 1be04b50ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -99,7 +99,7 @@ musl-git-%:
cd $@.tmp && git fsck cd $@.tmp && git fsck
mv $@.tmp $@ mv $@.tmp $@
%.orig: $(SOURCES)/%.tar.gz | $(SOURCES)/config.sub %.orig: $(SOURCES)/%.tar.gz
rm -rf $@.tmp rm -rf $@.tmp
mkdir $@.tmp mkdir $@.tmp
( cd $@.tmp && tar zxvf - ) < $< ( cd $@.tmp && tar zxvf - ) < $<
@ -108,7 +108,7 @@ musl-git-%:
mv $@.tmp/$(patsubst %.orig,%,$@) $@ mv $@.tmp/$(patsubst %.orig,%,$@) $@
rm -rf $@.tmp rm -rf $@.tmp
%.orig: $(SOURCES)/%.tar.bz2 | $(SOURCES)/config.sub %.orig: $(SOURCES)/%.tar.bz2
rm -rf $@.tmp rm -rf $@.tmp
mkdir $@.tmp mkdir $@.tmp
( cd $@.tmp && tar jxvf - ) < $< ( cd $@.tmp && tar jxvf - ) < $<
@ -117,7 +117,7 @@ musl-git-%:
mv $@.tmp/$(patsubst %.orig,%,$@) $@ mv $@.tmp/$(patsubst %.orig,%,$@) $@
rm -rf $@.tmp rm -rf $@.tmp
%.orig: $(SOURCES)/%.tar.xz | $(SOURCES)/config.sub %.orig: $(SOURCES)/%.tar.xz
rm -rf $@.tmp rm -rf $@.tmp
mkdir $@.tmp mkdir $@.tmp
( cd $@.tmp && tar Jxvf - ) < $< ( cd $@.tmp && tar Jxvf - ) < $<
@ -126,7 +126,7 @@ musl-git-%:
mv $@.tmp/$(patsubst %.orig,%,$@) $@ mv $@.tmp/$(patsubst %.orig,%,$@) $@
rm -rf $@.tmp rm -rf $@.tmp
%: %.orig %: %.orig | $(SOURCES)/config.sub
rm -rf $@.tmp rm -rf $@.tmp
mkdir $@.tmp mkdir $@.tmp
( cd $@.tmp && find ../$< -path '*/*/*' -prune -exec sh -c 'ln -s "$$@" .' ':' {} + ) ( cd $@.tmp && find ../$< -path '*/*/*' -prune -exec sh -c 'ln -s "$$@" .' ':' {} + )