[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5506/8267] net-tools: Fix build with USE_NLS="no"

[Emmanuele Bassi <ebassi src gnome org>]

commit a99bb57bba2be693e2519bb4d18da181eb7634f9
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Tue Apr 4 11:09:29 2017 +0300

    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].
    
    (From OE-Core rev: 95d6910bb5d9331adb7a693fcb4f7b1271c68cc6)
    
    Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../net-tools/net-tools_1.60-26.bb                 |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
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 115b398..45d7bf4 100644
--- 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() {