uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

GNUmakefile: filter out SKIP_UTILS from UTILS

Browse Source 
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>
This commit is contained in:
Etienne Cordonnier
2025-10-13 10:10:40 +02:00
parent 16af7d4f9a
commit 84a6e1e1ca
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GNUmakefile
+4 -4
View File
@@ -228,7 +228,7 @@ ifneq ($(OS),Windows_NT)
PROGS := $(PROGS) $(SELINUX_PROGS)
endif
UTILS ?= $(PROGS)
UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
ifneq ($(findstring stdbuf,$(UTILS)),)
# Use external libstdbuf per default. It is more robust than embedding libstdbuf.
@@ -306,7 +306,7 @@ TEST_PROGS := \
who
TESTS := \
$(sort $(filter $(UTILS),$(filter-out $(SKIP_UTILS),$(TEST_PROGS))))
$(sort $(filter $(UTILS),$(TEST_PROGS)))
TEST_NO_FAIL_FAST :=
TEST_SPEC_FEATURE :=
@@ -326,7 +326,7 @@ endef
# Output names
EXES := \
$(sort $(filter $(UTILS),$(filter-out $(SKIP_UTILS),$(PROGS))))
$(sort $(UTILS))
INSTALLEES := ${EXES}
ifeq (${MULTICALL}, y)
@@ -352,7 +352,7 @@ build-coreutils:
build: build-coreutils build-pkgs locales
$(foreach test,$(filter-out $(SKIP_UTILS),$(PROGS)),$(eval $(call TEST_BUSYBOX,$(test))))
$(foreach test,$(UTILS),$(eval $(call TEST_BUSYBOX,$(test))))
test:
${CARGO} test ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" --no-default-features $(TEST_NO_FAIL_FAST)