diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-04-04 11:09:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-05 23:22:13 +0100 |
commit | a99bb57bba2be693e2519bb4d18da181eb7634f9 (patch) | |
tree | c968441a7c31bd06a89085927ee02ddf10f3bf0b | |
parent | 3ed3ba16cbf7f9ca929dbcb90b14212a97f6b200 (diff) | |
download | poky-a99bb57bba2be693e2519bb4d18da181eb7634f9.tar.gz |
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>
-rw-r--r-- | meta/recipes-extended/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 115b3987c3..45d7bf4524 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() { | |||
70 | bb.build.exec_func('patch_do_patch', d) | 70 | bb.build.exec_func('patch_do_patch', d) |
71 | } | 71 | } |
72 | 72 | ||
73 | # i18n only enabled for the target, doesn't build for native | ||
74 | # and isn't needed there. | ||
75 | disable_i18n() { | ||
76 | sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make | ||
77 | } | ||
78 | disable_i18n_class-target () { | ||
79 | : | ||
80 | } | ||
81 | |||
82 | do_configure() { | 73 | do_configure() { |
83 | # net-tools has its own config mechanism requiring "make config" | 74 | # net-tools has its own config mechanism requiring "make config" |
84 | # we pre-generate desired options and copy to source directory instead | 75 | # we pre-generate desired options and copy to source directory instead |
85 | cp ${WORKDIR}/net-tools-config.h ${S}/config.h | 76 | cp ${WORKDIR}/net-tools-config.h ${S}/config.h |
86 | cp ${WORKDIR}/net-tools-config.make ${S}/config.make | 77 | cp ${WORKDIR}/net-tools-config.make ${S}/config.make |
87 | disable_i18n | 78 | |
79 | if [ "${USE_NLS}" = "no" ]; then | ||
80 | sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make | ||
81 | fi | ||
88 | } | 82 | } |
89 | 83 | ||
90 | do_compile() { | 84 | do_compile() { |