summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-20 17:13:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-23 16:20:11 +0100
commit24b1fe929b5a22e3ad3a725bff916c2febea207a (patch)
treeec15b6bc831c6efe0e8293c382f0b56744fc0278 /meta
parent7f5d712f377b5d69fbb2f511eb420eaeebfc796a (diff)
downloadpoky-24b1fe929b5a22e3ad3a725bff916c2febea207a.tar.gz
gettext: Improve USE_NLS handling for nativesdk/crosssdk/cross-canadian
The gettext handling of USE_NLS has become a bit tricky to understand, or alter from the SDK context. This patch introduces a SDKUSE_NLS which can be set to configure a given SDK/ADT to use NLS or not. This is independent of the target system NLS usage. The code in gettext.bbclass is therefore simplified and the classes themselves now set USE_NLS to appropriate values. No NLS is used for native, cross and crosssdk since it is never used there and would just increase build time. (From OE-Core rev: fe634d47449899f7424adb77ff5bc7ddf8a07a47) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cross-canadian.bbclass2
-rw-r--r--meta/classes/cross.bbclass2
-rw-r--r--meta/classes/crosssdk.bbclass2
-rw-r--r--meta/classes/gettext.bbclass8
-rw-r--r--meta/classes/native.bbclass2
-rw-r--r--meta/classes/nativesdk.bbclass2
-rw-r--r--meta/conf/bitbake.conf1
7 files changed, 14 insertions, 5 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 7ab36ac2ce..fa2ab70a34 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -94,3 +94,5 @@ SHLIBSDIRS = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/
94SHLIBSDIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/" 94SHLIBSDIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/shlibs/"
95 95
96do_populate_sysroot[stamp-extra-info] = "" 96do_populate_sysroot[stamp-extra-info] = ""
97
98USE_NLS = "${SDKUSE_NLS}"
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 54584fea52..f6e7dc1b39 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -75,3 +75,5 @@ cross_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
75do_install () { 75do_install () {
76 oe_runmake 'DESTDIR=${D}' install 76 oe_runmake 'DESTDIR=${D}' install
77} 77}
78
79USE_NLS = "no"
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index 810f61d0ad..635c0c45cb 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -30,3 +30,5 @@ do_populate_sysroot[stamp-extra-info] = ""
30 30
31# Need to force this to ensure consitency accross architectures 31# Need to force this to ensure consitency accross architectures
32EXTRA_OECONF_FPU = "" 32EXTRA_OECONF_FPU = ""
33
34USE_NLS = "no"
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 17c894f74d..03b89b2455 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -1,17 +1,15 @@
1def gettext_dependencies(d): 1def gettext_dependencies(d):
2 if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'):
3 return ""
4 if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): 2 if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'):
5 return "" 3 return ""
6 if oe.utils.inherits(d, 'native', 'cross'): 4 if d.getVar('USE_NLS', True) == 'no':
7 return "gettext-minimal-native" 5 return "gettext-minimal-native"
8 return d.getVar('DEPENDS_GETTEXT', False) 6 return d.getVar('DEPENDS_GETTEXT', False)
9 7
10def gettext_oeconf(d): 8def gettext_oeconf(d):
11 if oe.utils.inherits(d, 'native', 'cross'): 9 if d.getVar('USE_NLS', True) == 'no':
12 return '--disable-nls' 10 return '--disable-nls'
13 # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set 11 # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
14 if (d.getVar('USE_NLS', True) == 'no' or d.getVar('INHIBIT_DEFAULT_DEPS', True)) and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): 12 if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'):
15 return '--disable-nls' 13 return '--disable-nls'
16 return "--enable-nls" 14 return "--enable-nls"
17 15
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 04f0d06ad9..102dfb8872 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -158,3 +158,5 @@ do_package_write_deb[noexec] = "1"
158do_package_write_rpm[noexec] = "1" 158do_package_write_rpm[noexec] = "1"
159 159
160do_populate_sysroot[stamp-extra-info] = "" 160do_populate_sysroot[stamp-extra-info] = ""
161
162USE_NLS = "no"
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 96e1b42a49..5b9d1f5748 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -89,3 +89,5 @@ addhandler nativesdk_virtclass_handler
89nativesdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" 89nativesdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
90 90
91do_populate_sysroot[stamp-extra-info] = "" 91do_populate_sysroot[stamp-extra-info] = ""
92
93USE_NLS = "${SDKUSE_NLS}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 43acc077b8..d98fde1583 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -110,6 +110,7 @@ TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}"
110LIBCEXTENSION ??= "" 110LIBCEXTENSION ??= ""
111ABIEXTENSION ??= "" 111ABIEXTENSION ??= ""
112USE_NLS ??= "yes" 112USE_NLS ??= "yes"
113SDKUSE_NLS ??= "yes"
113 114
114TARGET_ARCH = "${TUNE_ARCH}" 115TARGET_ARCH = "${TUNE_ARCH}"
115TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" 116TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}"