60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
|
# patch to workaround error
|
||
|
|
# meson.build:242:7: ERROR: add_install_script args must be strings
|
||
|
|
# Upstream status: not upstreamable (workaround)
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 8af9e18..c82597c 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -239,12 +239,6 @@ if build_ping == true
|
||
|
|
dependencies : [m_dep, cap_dep, idn_dep, crypto_dep, resolv_dep],
|
||
|
|
link_with : [libcommon],
|
||
|
|
install: true)
|
||
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
||
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
||
|
|
- 'ping',
|
||
|
|
- perm_type,
|
||
|
|
- setcap.path()
|
||
|
|
- )
|
||
|
|
endif
|
||
|
|
|
||
|
|
if build_tracepath == true
|
||
|
|
@@ -259,12 +253,6 @@ if build_traceroute6 == true
|
||
|
|
dependencies : [cap_dep, idn_dep],
|
||
|
|
link_with : [libcommon],
|
||
|
|
install: true)
|
||
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
||
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
||
|
|
- 'traceroute6',
|
||
|
|
- perm_type,
|
||
|
|
- setcap.path()
|
||
|
|
- )
|
||
|
|
endif
|
||
|
|
|
||
|
|
if build_clockdiff == true
|
||
|
|
@@ -272,12 +260,6 @@ if build_clockdiff == true
|
||
|
|
dependencies : [cap_dep],
|
||
|
|
link_with : [libcommon],
|
||
|
|
install: true)
|
||
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
||
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
||
|
|
- 'clockdiff',
|
||
|
|
- perm_type,
|
||
|
|
- setcap.path()
|
||
|
|
- )
|
||
|
|
endif
|
||
|
|
|
||
|
|
if build_rinfod == true
|
||
|
|
@@ -302,12 +284,6 @@ if build_arping == true
|
||
|
|
dependencies : [rt_dep, cap_dep, idn_dep],
|
||
|
|
link_with : [libcommon],
|
||
|
|
install: true)
|
||
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
||
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
||
|
|
- 'arping',
|
||
|
|
- perm_type,
|
||
|
|
- setcap.path()
|
||
|
|
- )
|
||
|
|
endif
|
||
|
|
|
||
|
|
if build_tftpd == true
|