From 1be04b50ec4d8e1b2528903e47a0f18346833b10 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 22 Jan 2020 17:26:56 -0500 Subject: [PATCH] move config.sub dependency to patched source trees instead of orig ones this was overlooked when cowpatch was introduced. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0510972..cf6c084 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ musl-git-%: cd $@.tmp && git fsck mv $@.tmp $@ -%.orig: $(SOURCES)/%.tar.gz | $(SOURCES)/config.sub +%.orig: $(SOURCES)/%.tar.gz rm -rf $@.tmp mkdir $@.tmp ( cd $@.tmp && tar zxvf - ) < $< @@ -108,7 +108,7 @@ musl-git-%: mv $@.tmp/$(patsubst %.orig,%,$@) $@ rm -rf $@.tmp -%.orig: $(SOURCES)/%.tar.bz2 | $(SOURCES)/config.sub +%.orig: $(SOURCES)/%.tar.bz2 rm -rf $@.tmp mkdir $@.tmp ( cd $@.tmp && tar jxvf - ) < $< @@ -117,7 +117,7 @@ musl-git-%: mv $@.tmp/$(patsubst %.orig,%,$@) $@ rm -rf $@.tmp -%.orig: $(SOURCES)/%.tar.xz | $(SOURCES)/config.sub +%.orig: $(SOURCES)/%.tar.xz rm -rf $@.tmp mkdir $@.tmp ( cd $@.tmp && tar Jxvf - ) < $< @@ -126,7 +126,7 @@ musl-git-%: mv $@.tmp/$(patsubst %.orig,%,$@) $@ rm -rf $@.tmp -%: %.orig +%: %.orig | $(SOURCES)/config.sub rm -rf $@.tmp mkdir $@.tmp ( cd $@.tmp && find ../$< -path '*/*/*' -prune -exec sh -c 'ln -s "$$@" .' ':' {} + )