From 59d9dff00c15e4765eca6f8cb4e8f2c9ca9854b6 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 31 Jan 2020 16:53:24 -0500 Subject: [PATCH] improve patch dependency rules approach in commit 8a92c5230c3808ae5baa76977823e717255bd506 only worked for the "current version" of the packages configured with GCC_VER, etc. now, all versions have proper dependencies so that it's possible to test applicability of new patches just by running make with the directory name. --- Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ae52ba5..d1b922a 100644 --- a/Makefile +++ b/Makefile @@ -139,14 +139,9 @@ musl-git-%: rm -rf $@ mv $@.tmp $@ -binutils-$(BINUTILS_VER): $(wildcard patches/binutils-$(BINUTILS_VER) patches/binutils-$(BINUTILS_VER)/*) -gcc-$(GCC_VER): $(wildcard patches/gcc-$(GCC_VER) patches/gcc-$(GCC_VER)/*) -musl-$(MUSL_VER): $(wildcard patches/musl-$(MUSL_VER) patches/musl-$(MUSL_VER)/*) -gmp-$(GMP_VER): $(wildcard patches/gmp-$(GMP_VER) patches/gmp-$(GMP_VER)/*) -mpfr-$(MPFR_VER): $(wildcard patches/mpfr-$(MPFR_VER) patches/mpfr-$(MPFR_VER)/*) -mpc-$(MPC_VER): $(wildcard patches/mpc-$(MPC_VER) patches/mpc-$(MPC_VER)/*) -ils-$(ISL_VER): $(wildcard patches/isl-$(ISL_VER) patches/isl-$(ISL_VER)/*) -linux-$(LINUX_VER): $(wildcard patches/linux-$(LINUX_VER) patches/linux-$(LINUX_VER)/*) + +# Add deps for all patched source dirs on their patchsets +$(foreach dir,$(notdir $(basename $(basename $(basename $(wildcard hashes/*))))),$(eval $(dir): $$(wildcard patches/$(dir) patches/$(dir)/*))) extract_all: | $(SRC_DIRS)