GNUMakefile: install libstdbuf

Ecordonnier · Ecordonnier · commit 5070e5fb3972 · 2025-06-21T23:56:17.000+02:00
When installing with GNUMakefile, enabling feat_external_libstdbuf is the better option,
because embedding libstdbuf inside the stdbuf binary is advantageous only for working around
limitations of "cargo install", which can't install C shared libraries.

Signed-off-by: Etienne Cordonnier &lt;ecordonnier@snap.com&gt;
diff --git a/GNUmakefile b/GNUmakefile
@@ -436,8 +436,19 @@ else
 install-locales:
 endif
 
+ifneq ($(OS),Windows_NT)
+CARGOFLAGS += --features feat_external_libstdbuf
+endif
+
+# Use the same default as in .cargo/config.toml
+LIBSTDBUF_DIR ?= /usr/lib
+
 install: build install-manpages install-completions install-locales
 	mkdir -p $(INSTALLDIR_BIN)
+ifneq ($(OS),Windows_NT)
+	mkdir -p $(DESTDIR)$(LIBSTDBUF_DIR)
+	cp $(BUILDDIR)/deps/libstdbuf* $(DESTDIR)$(LIBSTDBUF_DIR)/
+endif
 ifeq (${MULTICALL}, y)
 	$(INSTALL) $(BUILDDIR)/coreutils $(INSTALLDIR_BIN)/$(PROG_PREFIX)coreutils
 	$(foreach prog, $(filter-out coreutils, $(INSTALLEES)), \
@@ -452,6 +463,10 @@ else
 endif
 
 uninstall:
+ifneq ($(OS),Windows_NT)
+	rm -f $(DESTDIR)$(LIBSTDBUF_DIR)/libstdbuf*
+	-rmdir $(DESTDIR)$(LIBSTDBUF_DIR) 2>/dev/null || true
+endif
 ifeq (${MULTICALL}, y)
 	rm -f $(addprefix $(INSTALLDIR_BIN)/,$(PROG_PREFIX)coreutils)
 endif
