pkg.in/*/Makefile: refactor using archdep-filter

Duplicating the architecture tag handling logic was afwul indeed; one-liner (well, two lines for readability) is not that bad at least, factoring it out wouldn't gain a lot. Fixes: 75735473

pkg.in/*/Makefile: refactor using archdep-filter
e0def77c · Michael Shigorin · fab15ba7 · e0def77c · e0def77c
Commit e0def77c authored Oct 23, 2019 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 16 deletions

Makefile pkg.in/lists/Makefile +1 -8

Makefile pkg.in/profiles/Makefile +1 -8

No files found.
--- a/pkg.in/lists/Makefile
+++ b/pkg.in/lists/Makefile
@@ -35,16 +35,9 @@ copy-groups:
 	@echo $(call groups2lists) \
 	| xargs -r -- cp --parents -at $(TARGET) --
-grep-archdep: a = $(ARCH)
 grep-archdep:
-	@# xargs -L 1024 -n 1024 ? -- breaks -I
 	@find $(TARGET) -type f \
-	| xargs -I '__' sh -c '\
+	| xargs -r -I __ -- archdep-filter -a "$(ARCH)" -i __
-		sed -ri  "s/\\<([^@ ]*)@X86\\>/\\1@i586 \\1@x86_64/g" __; \
-		sed -ri  "s/\\<([^@ ]*)@IA32\\>/\\1@i586 i586-\\1@x86_64/g" __;\
-		sed -rni "s/\\<([^@ ]*)\\>|\\<([^@ ]*)@$a\\>/\\1\\2/pg" __; \
-		sed -ri  "s/\\<([^@ ]*)@[^@ ]+\\> *//g" __; \
-		sed -ri  "s/^ +//;s/ +$$//" __'
 # do beforehand as foreach gets expanded before recipe execution
 $(TARGET):

--- a/pkg.in/profiles/Makefile
+++ b/pkg.in/profiles/Makefile
@@ -18,16 +18,9 @@ copy-profiles:
 			$(addsuffix .directory,$(THE_PROFILES)); \
 	fi
-### exact copy of a snippet from ../lists/Makefile
-grep-archdep: a = $(ARCH)
 grep-archdep:
-	@# xargs -L 1024 -n 1024 ? -- breaks -I
 	@find $(TARGET) -type f \
-	| xargs -I '__' sh -c '\
+	| xargs -r -I __ -- archdep-filter -a "$(ARCH)" -i __
-		sed -ri  "s/\\<([^@ ]*)@X86\\>/\\1@i586 \\1@x86_64/g" __; \
-		sed -ri  "s/\\<([^@ ]*)@IA32\\>/\\1@i586 i586-\\1@x86_64/g" __;\
-		sed -rni "s/\\<([^@ ]*)\\>|\\<([^@ ]*)@$a\\>/\\1\\2/pg" __; \
-		sed -ri  "s/\\<([^@ ]*)@[^@ ]+\\> *//g" __'
 $(TARGET):
 	@mkdir -p $(TARGET)