summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2019-05-16 09:44:27 +0000
committerMichael Weiss <dev.primeos@gmail.com>2019-05-16 22:59:58 +0200
commit473be6467f995865244e7e68b2fa587a4ee79551 (patch)
treef24a6578f0bc55ae2b13ea15e5d847c6a6ca8f70
parent37facc7e70139bf5e05448b4412ac71ab3333f62 (diff)
downloadiputils-473be6467f995865244e7e68b2fa587a4ee79551.tar.gz
build-sys: Make setcap really optional
The setcap dependency is marked as optional but meson.build depends on setcap.path(): meson.build:246:7: ERROR: add_install_script args must be strings
-rw-r--r--meson.build11
1 files changed, 7 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 8af9e18..95c778a 100644
--- a/meson.build
+++ b/meson.build
@@ -221,10 +221,13 @@ config_h = configure_file(
setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
if get_option('NO_SETCAP_OR_SUID')
perm_type = 'none'
+ setcap_path = '/dev/null'
elif cap_dep.found() and setcap.found()
perm_type = 'caps'
+ setcap_path = setcap.path()
else
perm_type = 'setuid'
+ setcap_path = '/dev/null'
endif
############################################################
@@ -243,7 +246,7 @@ if build_ping == true
join_paths(get_option('prefix'), get_option('bindir')),
'ping',
perm_type,
- setcap.path()
+ setcap_path
)
endif
@@ -263,7 +266,7 @@ if build_traceroute6 == true
join_paths(get_option('prefix'), get_option('bindir')),
'traceroute6',
perm_type,
- setcap.path()
+ setcap_path
)
endif
@@ -276,7 +279,7 @@ if build_clockdiff == true
join_paths(get_option('prefix'), get_option('bindir')),
'clockdiff',
perm_type,
- setcap.path()
+ setcap_path
)
endif
@@ -306,7 +309,7 @@ if build_arping == true
join_paths(get_option('prefix'), get_option('bindir')),
'arping',
perm_type,
- setcap.path()
+ setcap_path
)
endif