net-tools: Fix build with USE_NLS="no"

The configuration change was already done for -native but
we really want it when USE_NLS is set.

Fixes [YOCTO #11285].

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 115b3987c33639bc40d0e39bd252c24fcc3b2595..45d7bf452404e585c1bf9c4f7264b27cfc84d596 100644 (file)
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -70,21 +70,15 @@ python do_patch() {
     bb.build.exec_func('patch_do_patch', d)
 }
 
-# i18n only enabled for the target, doesn't build for native
-# and isn't needed there.
-disable_i18n() {
-       sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make
-}
-disable_i18n_class-target () {
-       :
-}
-
 do_configure() {
        # net-tools has its own config mechanism requiring "make config"
        # we pre-generate desired options and copy to source directory instead
        cp ${WORKDIR}/net-tools-config.h    ${S}/config.h
        cp ${WORKDIR}/net-tools-config.make ${S}/config.make
-       disable_i18n
+
+       if [ "${USE_NLS}" = "no" ]; then
+               sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make
+       fi
 }
 
 do_compile() {