Skip to content

Commit 84a6e1e

Browse files
committed
GNUmakefile: filter out SKIP_UTILS from UTILS
This fixes this corner-case where SKIP_UTILS was not taken into account in the logic enabling feat_external_libstdbuf: ``` sudo make install SKIP_UTILS=stdbuf ... error: none of the selected packages contains this feature: feat_external_libstdbuf ``` Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
1 parent 16af7d4 commit 84a6e1e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

GNUmakefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ ifneq ($(OS),Windows_NT)
228228
PROGS := $(PROGS) $(SELINUX_PROGS)
229229
endif
230230

231-
UTILS ?= $(PROGS)
231+
UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
232232

233233
ifneq ($(findstring stdbuf,$(UTILS)),)
234234
# Use external libstdbuf per default. It is more robust than embedding libstdbuf.
@@ -306,7 +306,7 @@ TEST_PROGS := \
306306
who
307307

308308
TESTS := \
309-
$(sort $(filter $(UTILS),$(filter-out $(SKIP_UTILS),$(TEST_PROGS))))
309+
$(sort $(filter $(UTILS),$(TEST_PROGS)))
310310

311311
TEST_NO_FAIL_FAST :=
312312
TEST_SPEC_FEATURE :=
@@ -326,7 +326,7 @@ endef
326326

327327
# Output names
328328
EXES := \
329-
$(sort $(filter $(UTILS),$(filter-out $(SKIP_UTILS),$(PROGS))))
329+
$(sort $(UTILS))
330330

331331
INSTALLEES := ${EXES}
332332
ifeq (${MULTICALL}, y)
@@ -352,7 +352,7 @@ build-coreutils:
352352

353353
build: build-coreutils build-pkgs locales
354354

355-
$(foreach test,$(filter-out $(SKIP_UTILS),$(PROGS)),$(eval $(call TEST_BUSYBOX,$(test))))
355+
$(foreach test,$(UTILS),$(eval $(call TEST_BUSYBOX,$(test))))
356356

357357
test:
358358
${CARGO} test ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" --no-default-features $(TEST_NO_FAIL_FAST)

0 commit comments

Comments
 (0)