2019-06-19 23:30:07 +02:00
|
|
|
From 418d8bea5424d8a14a21fd7928747a233557618c Mon Sep 17 00:00:00 2001
|
2019-06-09 11:38:12 +02:00
|
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
2019-06-19 23:30:07 +02:00
|
|
|
Date: Sun, 9 Jun 2019 18:38:37 +0200
|
|
|
|
|
Subject: [PATCH] build-sys: fix build with NLS
|
2019-06-09 11:38:12 +02:00
|
|
|
|
|
|
|
|
With some toolchains, intl is needed for NLS support so search for this
|
2019-06-19 23:30:07 +02:00
|
|
|
library and use if needed.
|
2019-06-09 11:38:12 +02:00
|
|
|
|
|
|
|
|
Fixes:
|
|
|
|
|
- http://autobuild.buildroot.org/results/0a8a3efe734ac7fb3a68ba505277681857dc0a3d
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
2019-06-19 23:30:07 +02:00
|
|
|
Upstream status: commit 418d8bea5424d8a14a21fd7928747a233557618c
|
2019-06-09 11:38:12 +02:00
|
|
|
---
|
|
|
|
|
meson.build | 11 +++++++----
|
|
|
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/meson.build b/meson.build
|
2019-06-19 23:30:07 +02:00
|
|
|
index 3766edc..2b545b6 100644
|
2019-06-09 11:38:12 +02:00
|
|
|
--- a/meson.build
|
|
|
|
|
+++ b/meson.build
|
2019-06-19 23:30:07 +02:00
|
|
|
@@ -77,6 +77,8 @@ if opt != ''
|
|
|
|
|
conf.set_quoted('DEFAULT_DEVICE', opt, description : 'arping default device.')
|
2019-06-09 11:38:12 +02:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
+# Some systems needs intl for gettext
|
2019-06-19 23:30:07 +02:00
|
|
|
+intl_dep = []
|
|
|
|
|
opt = get_option('USE_GETTEXT')
|
2019-06-09 11:38:12 +02:00
|
|
|
if opt == true
|
2019-06-19 23:30:07 +02:00
|
|
|
prefix = get_option('prefix')
|
|
|
|
|
@@ -86,6 +88,7 @@ if opt == true
|
|
|
|
|
conf.set('ENABLE_NLS', 1, description : 'If set enable I18N.')
|
|
|
|
|
conf.set_quoted('LOCALEDIR', join_paths(prefix, localedir))
|
|
|
|
|
subdir ('po')
|
|
|
|
|
+ intl_dep += cc.find_library('intl', required : false)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
opt = get_option('USE_IDN')
|
|
|
|
|
@@ -243,7 +246,7 @@ libcommon = static_library(
|
2019-06-09 11:38:12 +02:00
|
|
|
|
|
|
|
|
if build_ping == true
|
|
|
|
|
executable('ping', ['ping.c', 'ping_common.c', 'ping6_common.c', git_version_h],
|
2019-06-19 23:30:07 +02:00
|
|
|
- dependencies : [m_dep, cap_dep, idn_dep, crypto_dep, resolv_dep],
|
|
|
|
|
+ dependencies : [m_dep, cap_dep, idn_dep, intl_dep, crypto_dep, resolv_dep],
|
2019-06-09 11:38:12 +02:00
|
|
|
link_with : [libcommon],
|
|
|
|
|
install: true)
|
|
|
|
|
meson.add_install_script('build-aux/setcap-setuid.sh',
|
2019-06-19 23:30:07 +02:00
|
|
|
@@ -256,7 +259,7 @@ endif
|
2019-06-09 11:38:12 +02:00
|
|
|
|
|
|
|
|
if build_tracepath == true
|
|
|
|
|
executable('tracepath', ['tracepath.c', git_version_h],
|
|
|
|
|
- dependencies : idn_dep,
|
|
|
|
|
+ dependencies : [idn_dep, intl_dep],
|
|
|
|
|
link_with : [libcommon],
|
|
|
|
|
install: true)
|
|
|
|
|
endif
|
2019-06-19 23:30:07 +02:00
|
|
|
@@ -276,7 +279,7 @@ endif
|
2019-06-09 11:38:12 +02:00
|
|
|
|
|
|
|
|
if build_clockdiff == true
|
|
|
|
|
executable('clockdiff', ['clockdiff.c', git_version_h],
|
|
|
|
|
- dependencies : [cap_dep],
|
|
|
|
|
+ dependencies : [cap_dep, intl_dep],
|
|
|
|
|
link_with : [libcommon],
|
|
|
|
|
install: true)
|
|
|
|
|
meson.add_install_script('build-aux/setcap-setuid.sh',
|
2019-06-19 23:30:07 +02:00
|
|
|
@@ -306,7 +309,7 @@ endif
|
2019-06-09 11:38:12 +02:00
|
|
|
|
|
|
|
|
if build_arping == true
|
|
|
|
|
executable('arping', ['arping.c', git_version_h],
|
|
|
|
|
- dependencies : [rt_dep, cap_dep, idn_dep],
|
|
|
|
|
+ dependencies : [rt_dep, cap_dep, idn_dep, intl_dep],
|
|
|
|
|
link_with : [libcommon],
|
|
|
|
|
install: true)
|
|
|
|
|
meson.add_install_script('build-aux/setcap-setuid.sh',
|
|
|
|
|
--
|
2019-06-19 23:30:07 +02:00
|
|
|
2.21.0
|
2019-06-09 11:38:12 +02:00
|
|
|
|
