glib-2.0: Clean up anonymous methods

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@876 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.10.3.bb b/meta/packages/glib-2.0/glib-2.0-native_2.10.3.bb
index 402ec2d390b53cdf624873767111a541351f25af..753e6ad2c74c105ab789210e4c4299631c2add00 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0-native_2.10.3.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.10.3.bb
@@ -20,11 +20,6 @@ S = "${WORKDIR}/glib-${PV}"
 
 inherit autotools pkgconfig native gettext
 
-python () {
-       if bb.data.getVar("USE_NLS", d, 1) == "no":
-               raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
-
 acpaths = ""
 do_configure_prepend () {
        install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .

diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.12.0.bb b/meta/packages/glib-2.0/glib-2.0-native_2.12.0.bb
index 768f2777d8ea42c8192a54de31adea17051d3d5c..065f5bc3e70a75749fa01b82f5dc78fb342e03d0 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0-native_2.12.0.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.12.0.bb
@@ -19,11 +19,6 @@ S = "${WORKDIR}/glib-${PV}"
 
 inherit autotools pkgconfig native gettext
 
-python () {
-       if bb.data.getVar("USE_NLS", d, 1) == "no":
-               raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
-
 acpaths = ""
 do_configure_prepend () {
        install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .

diff --git a/meta/packages/glib-2.0/glib-2.0.inc b/meta/packages/glib-2.0/glib-2.0.inc
new file mode 100644 (file)
index 0000000..ccbbd2b
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0.inc
@@ -0,0 +1,6 @@
+
+python () {
+    import bb
+    if bb.data.getVar("USE_NLS", d, 1) == "no":
+        raise bb.parse.SkipPackage("${PN} requires native language support.")
+}

diff --git a/meta/packages/glib-2.0/glib-2.0_2.10.3.bb b/meta/packages/glib-2.0/glib-2.0_2.10.3.bb
index df0f3bd82c3224feff996b497d0fcb0793ff26cc..799101d43f092583cded9a68bfe4a2d3ebc1ee0a 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0_2.10.3.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.10.3.bb
@@ -24,10 +24,7 @@ S = "${WORKDIR}/glib-${PV}"
 
 inherit autotools pkgconfig gettext
 
-python () {
-       if bb.data.getVar("USE_NLS", d, 1) == "no":
-               raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
+require glib-2.0.inc
 
 acpaths = ""
 do_configure_prepend () {

diff --git a/meta/packages/glib-2.0/glib-2.0_2.12.0.bb b/meta/packages/glib-2.0/glib-2.0_2.12.0.bb
index 31d7347a060f10068a567496b0c0831da90d91e3..ff2ff98a8636fcca8e6fd278cff04d961eff0679 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0_2.12.0.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.12.0.bb
@@ -23,10 +23,7 @@ S = "${WORKDIR}/glib-${PV}"
 
 inherit autotools pkgconfig gettext
 
-python () {
-       if bb.data.getVar("USE_NLS", d, 1) == "no":
-               raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
+require glib-2.0.inc
 
 acpaths = ""
 do_configure_prepend () {

diff --git a/meta/packages/glib-2.0/glib-2.0_2.6.4.bb b/meta/packages/glib-2.0/glib-2.0_2.6.4.bb
index f1cb21740a6b04ad934d088c8c29e27af800ed9d..9295338d870812a3633696e02f620ae840d44595 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0_2.6.4.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.6.4.bb
@@ -24,10 +24,7 @@ S = "${WORKDIR}/glib-${PV}"
 
 inherit autotools pkgconfig gettext
 
-python () {
-       if bb.data.getVar("USE_NLS", d, 1) == "no":
-               raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
+require glib-2.0.inc
 
 acpaths = ""
 do_configure_prepend () {

diff --git a/meta/packages/glib-2.0/glib-2.0_2.8.6.bb b/meta/packages/glib-2.0/glib-2.0_2.8.6.bb
index 3c106246c0c75e57879e832153c5140bfa1e640f..654b991144679923b910955359482009ba7a7b54 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0_2.8.6.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.8.6.bb
@@ -24,10 +24,7 @@ S = "${WORKDIR}/glib-${PV}"
 
 inherit autotools pkgconfig gettext
 
-python () {
-       if bb.data.getVar("USE_NLS", d, 1) == "no":
-               raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
+require glib-2.0.inc
 
 acpaths = ""
 do_configure_prepend () {