glib-2.0: Fix glib-mkenums to use /usr/bin/env perl

Signed-off-by: Tom Rini <tom_rini@mentor.com>

11 files changed, 37 insertions, 13 deletions

diff --git a/recipes/glib-2.0/files/glib-mkenums-interpreter.patch b/recipes/glib-2.0/files/glib-mkenums-interpreter.patch
new file mode 100644
index 0000000000..a44f09fb24
--- /dev/null
+++ b/recipes/glib-2.0/files/glib-mkenums-interpreter.patch
@@ -0,0 +1,11 @@
+diff -rNau glib-2.22.1.orig/gobject/glib-mkenums.in glib-2.22.1/gobject/glib-mkenums.in
+--- glib-2.22.1.orig/gobject/glib-mkenums.in	2009-09-22 09:33:24.000000000 -0400
++++ glib-2.22.1/gobject/glib-mkenums.in	2010-02-24 19:23:05.638244748 -0500
+@@ -1,5 +1,6 @@
+-#!@PERL_PATH@ -w
++#!/usr/bin/env perl
+ 
++use warnings;
+ use File::Basename;
+ 
+ # glib-mkenums.pl 
diff --git a/recipes/glib-2.0/glib-2.0_2.12.12.bb b/recipes/glib-2.0/glib-2.0_2.12.12.bb
index 27fbb94cd6..6de60ade46 100644
--- a/recipes/glib-2.0/glib-2.0_2.12.12.bb
+++ b/recipes/glib-2.0/glib-2.0_2.12.12.bb
@@ -1,10 +1,12 @@
 require glib.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch \
-           file://glib-2.6.4-fix-autotools-fiac.patch"
+           file://glib-2.6.4-fix-autotools-fiac.patch \
+           file://glib-mkenums-interpreter.patch \
+"
 
 
 SRC_URI[md5sum] = "0b3a42098243d054475ff6eb51ed2be1"
diff --git a/recipes/glib-2.0/glib-2.0_2.20.3.bb b/recipes/glib-2.0/glib-2.0_2.20.3.bb
index 9ee8b81f5e..2a37ae6d64 100644
--- a/recipes/glib-2.0/glib-2.0_2.20.3.bb
+++ b/recipes/glib-2.0/glib-2.0_2.20.3.bb
@@ -1,11 +1,12 @@
 require glib.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2;name=tarball \
   file://glibconfig-sysdefs.h \
   file://configure-libtool.patch \
   file://glib-2.6.4-fix-autotools-fiac.patch \
+  file://glib-mkenums-interpreter.patch \
 "
 SRC_URI_append_arm = " file://atomic-thumb.patch"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.20.4.bb b/recipes/glib-2.0/glib-2.0_2.20.4.bb
index 2126395a1e..09126d1847 100644
--- a/recipes/glib-2.0/glib-2.0_2.20.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.20.4.bb
@@ -1,11 +1,12 @@
 require glib.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2 \
   file://glibconfig-sysdefs.h \
   file://configure-libtool.patch \
   file://glib-2.6.4-fix-autotools-fiac.patch \
+  file://glib-mkenums-interpreter.patch \
 "
 SRC_URI_append_arm = " file://atomic-thumb.patch"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.22.1.bb b/recipes/glib-2.0/glib-2.0_2.22.1.bb
index ac2cdef6a0..9fa33bfe00 100644
--- a/recipes/glib-2.0/glib-2.0_2.22.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.22.1.bb
@@ -1,5 +1,5 @@
 require glib.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \
@@ -8,6 +8,7 @@ SRC_URI = "\
   file://bug-556515.patch \
   file://g_once_init_enter.patch \
   file://uclibc-res_query.patch \
+  file://glib-mkenums-interpreter.patch \
 "
 
 
diff --git a/recipes/glib-2.0/glib-2.0_2.22.4.bb b/recipes/glib-2.0/glib-2.0_2.22.4.bb
index ddaf4d2e0f..54a19f7096 100644
--- a/recipes/glib-2.0/glib-2.0_2.22.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.22.4.bb
@@ -14,6 +14,7 @@ SRC_URI = "\
   file://configure-libtool.patch \
   file://g_once_init_enter.patch \
   file://uclibc-res_query.patch \
+  file://glib-mkenums-interpreter.patch \
 "
 SRC_URI[archive.md5sum] = "d91bcbe27556430ddecce65086355708"
 SRC_URI[archive.sha256sum] = "0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14"
@@ -22,7 +23,7 @@ SRC_URI_append_arm = " file://atomic-thumb.patch"
 SRC_URI_append_armv6 = " file://gatomic_armv6.patch"
 SRC_URI_append_armv7a = " file://gatomic_armv6.patch" 
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools gettext
 
diff --git a/recipes/glib-2.0/glib-2.0_2.23.6.bb b/recipes/glib-2.0/glib-2.0_2.23.6.bb
index b2c900f480..550e9752e7 100644
--- a/recipes/glib-2.0/glib-2.0_2.23.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.23.6.bb
@@ -7,7 +7,7 @@ LICENSE = "LGPLv2+"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0-native gtk-doc virtual/libiconv virtual/libintl zlib"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-${PV}.tar.bz2;name=archive \
@@ -15,6 +15,7 @@ SRC_URI = "\
   file://configure-libtool.patch \
   file://g_once_init_enter.patch \
   file://gatomic-proper-pointer-get-cast.patch \
+  file://glib-mkenums-interpreter.patch \
 "
 SRC_URI[archive.md5sum] = "72e6eadc16d7022376ecef12c6fe905e"
 SRC_URI[archive.sha256sum] = "f91840e27ad4cd48e655a6babed7e2024f86814f94961da88ca2adba447c6e77"
diff --git a/recipes/glib-2.0/glib-2.0_2.24.0.bb b/recipes/glib-2.0/glib-2.0_2.24.0.bb
index b0755a48b1..5bb79015e2 100644
--- a/recipes/glib-2.0/glib-2.0_2.24.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.24.0.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0-native gtk-doc zlib"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2;name=archive \
@@ -20,6 +20,7 @@ SRC_URI = "\
   file://gvariant.patch \
   file://gasync.patch \
   file://60_wait-longer-for-threads-to-die.patch \
+  file://glib-mkenums-interpreter.patch \
 "
 
 SRC_URI[archive.md5sum] = "45a8bc697d07f859566c0b64c40382a8"
diff --git a/recipes/glib-2.0/glib-2.0_2.24.1.bb b/recipes/glib-2.0/glib-2.0_2.24.1.bb
index c91f626e16..401212d3da 100644
--- a/recipes/glib-2.0/glib-2.0_2.24.1.bb
+++ b/recipes/glib-2.0/glib-2.0_2.24.1.bb
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0-native gtk-doc zlib"
 DEPENDS_virtclass-native = "gettext-native gtk-doc-native \
                             pkgconfig-native"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2;name=archive \
@@ -20,6 +20,7 @@ SRC_URI = "\
   file://gatomic-proper-pointer-get-cast.patch \
   file://gio.patch \
   file://60_wait-longer-for-threads-to-die.patch \
+  file://glib-mkenums-interpreter.patch \
 "
 
 SRC_URI[archive.md5sum] = "6a7db81c9a2cffe6a34dadb57d7ba2d2"
diff --git a/recipes/glib-2.0/glib-2.0_2.6.4.bb b/recipes/glib-2.0/glib-2.0_2.6.4.bb
index fa2ec257e0..85dd2429c2 100644
--- a/recipes/glib-2.0/glib-2.0_2.6.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.6.4.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-PR = "r1"
+PR = "r2"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
@@ -25,7 +25,9 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
            file://glibinclude.patch;striplevel=2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch \
-           file://glib-2.6.4-fix-autotools-fiac.patch"
+           file://glib-2.6.4-fix-autotools-fiac.patch \
+           file://glib-mkenums-interpreter.patch \
+"
 
 S = "${WORKDIR}/glib-${PV}"
 
diff --git a/recipes/glib-2.0/glib-2.0_2.8.6.bb b/recipes/glib-2.0/glib-2.0_2.8.6.bb
index c4fd1ca28f..67b662ecf4 100644
--- a/recipes/glib-2.0/glib-2.0_2.8.6.bb
+++ b/recipes/glib-2.0/glib-2.0_2.8.6.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-PR = "r1"
+PR = "r2"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_${PN} = "${libdir}/lib*.so.*"
@@ -21,7 +21,9 @@ EXTRA_OECONF = "--disable-debug"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch \
-           file://glib-2.6.4-fix-autotools-fiac.patch"
+           file://glib-2.6.4-fix-autotools-fiac.patch \
+           file://glib-mkenums-interpreter.patch \
+"
 
 S = "${WORKDIR}/glib-${PV}"