[PATCH] bits: only build when cpu_set_t is available
Alyssa Ross <[email protected]>
| Newsgroups | org.kernel.vger.util-linux |
|---|---|
| Message-ID | <[email protected]> |
Doesn't build on macOS.
Fixes: 6e1301d59 ("text-utils: add bits command")
Signed-off-by: Alyssa Ross <[email protected]>
---
configure.ac | 6 +++++-
meson.build | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index a5d910204..ac043d856 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2309,7 +2309,11 @@ UL_REQUIRES_HAVE([scriptlive], [pty], [openpty function (libutil)])
AM_CONDITIONAL([BUILD_SCRIPTLIVE], [test "x$build_scriptlive" = xyes])
-UL_BUILD_INIT([bits], [yes])
+AC_ARG_ENABLE([bits],
+ AS_HELP_STRING([--disable-bits], [do not build bits]),
+ [], [UL_DEFAULT_ENABLE([bits], [check])])
+UL_BUILD_INIT([bits])
+UL_REQUIRES_HAVE([bits], [cpu_set_t], [cpu_set_t type])
AM_CONDITIONAL([BUILD_BITS], [test "x$build_bits" = xyes])
UL_BUILD_INIT([col], [check])
diff --git a/meson.build b/meson.build
index 1537f5e61..6e0381646 100644
--- a/meson.build
+++ b/meson.build
@@ -1248,7 +1248,7 @@ endif
############################################################
-opt = not get_option('build-bits').disabled()
+opt = not get_option('build-bits').require(have_cpu_set_t).disabled()
exe = executable(
'bits',
bits_sources,
base-commit: caa26876bc75041833c9644491cc2670d623f750
--
2.47.2