mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
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>
This commit is contained in:
@@ -303,10 +303,6 @@ python () {
|
||||
bb.note("SKIPPING %s because it's %s" % (pn, this_license))
|
||||
raise bb.parse.SkipPackage("incompatible with license %s" % this_license)
|
||||
|
||||
use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
|
||||
if use_nls != None:
|
||||
bb.data.setVar('USE_NLS', use_nls, d)
|
||||
|
||||
# Git packages should DEPEND on git-native
|
||||
srcuri = bb.data.getVar('SRC_URI', d, 1)
|
||||
if "git://" in srcuri:
|
||||
|
||||
@@ -14,7 +14,6 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
|
||||
PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
|
||||
|
||||
USE_NLS ?= "no"
|
||||
USE_NLS_glib-2.0 = "yes"
|
||||
|
||||
CXXFLAGS += "-fvisibility-inlines-hidden"
|
||||
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
|
||||
python () {
|
||||
import bb
|
||||
if bb.data.getVar("USE_NLS", d, 1) == "no":
|
||||
raise bb.parse.SkipPackage("${PN} requires native language support.")
|
||||
}
|
||||
@@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
|
||||
BUGTRACKER = "http://bugzilla.gnome.org"
|
||||
SECTION = "libs"
|
||||
|
||||
require glib-2.0.inc
|
||||
|
||||
DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
|
||||
DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
|
||||
DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
|
||||
@@ -36,3 +34,4 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include"
|
||||
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
|
||||
|
||||
ARM_INSTRUCTION_SET = "arm"
|
||||
USE_NLS = "yes"
|
||||
|
||||
Reference in New Issue
Block a user