summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 11:32:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 13:55:40 +0100
commit0496564b64798760116c55be27b9540c50ef4233 (patch)
tree84eb575f2df3d6d53881287dbe1f306e9213f8a5 /meta
parent1d2f3957b5c1e90b0e57ddb2488594e2db65e320 (diff)
downloadpoky-0496564b64798760116c55be27b9540c50ef4233.tar.gz
base/glib-2.0: Simplify USE_NLS handling for glib-2.0
Currently the only way to get anything to build is to set USE_NLS="yes" for glib-2.0. We might as well do this in the recipe by default for now and simpllify the code. The magic handling of USE_NLS_<recipename> is also removed since this can be done in the form USE_NLS_pn-<recipename> using overrides these days. (From OE-Core rev: 2e3727b05ae58aaf1eed88967c13cae085e7a702) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass4
-rw-r--r--meta/conf/distro/include/tclibc-uclibc.inc1
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0.inc6
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc3
4 files changed, 1 insertions, 13 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0bea639a95..575352d3f0 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -303,10 +303,6 @@ python () {
303 bb.note("SKIPPING %s because it's %s" % (pn, this_license)) 303 bb.note("SKIPPING %s because it's %s" % (pn, this_license))
304 raise bb.parse.SkipPackage("incompatible with license %s" % this_license) 304 raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
305 305
306 use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
307 if use_nls != None:
308 bb.data.setVar('USE_NLS', use_nls, d)
309
310 # Git packages should DEPEND on git-native 306 # Git packages should DEPEND on git-native
311 srcuri = bb.data.getVar('SRC_URI', d, 1) 307 srcuri = bb.data.getVar('SRC_URI', d, 1)
312 if "git://" in srcuri: 308 if "git://" in srcuri:
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 83418d6677..65693a9ca8 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -14,7 +14,6 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
14PREFERRED_PROVIDER_virtual/libintl ?= "gettext" 14PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
15 15
16USE_NLS ?= "no" 16USE_NLS ?= "no"
17USE_NLS_glib-2.0 = "yes"
18 17
19CXXFLAGS += "-fvisibility-inlines-hidden" 18CXXFLAGS += "-fvisibility-inlines-hidden"
20 19
diff --git a/meta/recipes-core/glib-2.0/glib-2.0.inc b/meta/recipes-core/glib-2.0/glib-2.0.inc
deleted file mode 100644
index ccbbd2b35a..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1
2python () {
3 import bb
4 if bb.data.getVar("USE_NLS", d, 1) == "no":
5 raise bb.parse.SkipPackage("${PN} requires native language support.")
6}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0800c85c4a..e25db3dea9 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
13BUGTRACKER = "http://bugzilla.gnome.org" 13BUGTRACKER = "http://bugzilla.gnome.org"
14SECTION = "libs" 14SECTION = "libs"
15 15
16require glib-2.0.inc
17
18DEPENDS = "glib-2.0-native gtk-doc-native zip dbus" 16DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
19DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native" 17DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
20DEPENDS_virtclass-nativesdk = "libtool-nativesdk" 18DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
@@ -36,3 +34,4 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include"
36FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" 34FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
37 35
38ARM_INSTRUCTION_SET = "arm" 36ARM_INSTRUCTION_SET = "arm"
37USE_NLS = "yes"