gtk+-2.20.0,gtk+-2.20.1: Fix case where /usr/bin/nm was being generated into libtool.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/gtk+/gtk+-2.20.0/cross-nm.patch b/recipes/gtk+/gtk+-2.20.0/cross-nm.patch
new file mode 100644 (file)
index 0000000..36e9557
--- /dev/null
+++ b/recipes/gtk+/gtk+-2.20.0/cross-nm.patch
@@ -0,0 +1,13 @@
+Index: gtk+-2.20.1/configure.in
+===================================================================
+--- gtk+-2.20.1.orig/configure.in      2010-07-10 16:25:40.000000000 -0700
++++ gtk+-2.20.1/configure.in   2010-07-12 22:08:49.878377002 -0700
+@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_CHECK_PROG(NM, nm, nm)
+ 
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE

diff --git a/recipes/gtk+/gtk+-2.20.1/cross-nm.patch b/recipes/gtk+/gtk+-2.20.1/cross-nm.patch
new file mode 100644 (file)
index 0000000..36e9557
--- /dev/null
+++ b/recipes/gtk+/gtk+-2.20.1/cross-nm.patch
@@ -0,0 +1,13 @@
+Index: gtk+-2.20.1/configure.in
+===================================================================
+--- gtk+-2.20.1.orig/configure.in      2010-07-10 16:25:40.000000000 -0700
++++ gtk+-2.20.1/configure.in   2010-07-12 22:08:49.878377002 -0700
+@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_CHECK_PROG(NM, nm, nm)
+ 
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE

diff --git a/recipes/gtk+/gtk+_2.20.0.bb b/recipes/gtk+/gtk+_2.20.0.bb
index 68bf212..7079979 100644 (file)
--- a/recipes/gtk+/gtk+_2.20.0.bb
+++ b/recipes/gtk+/gtk+_2.20.0.bb
@@ -2,11 +2,12 @@ require gtk+.inc
 
 SRC_URI_append_virtclass-native = " file://no-demos.patch \
 "
+SRC_URI_append = " file://cross-nm.patch"
 
 SRC_URI[gtk.md5sum] = "5517f78b1eb9b1eb60bd48a0152d09e6"
 SRC_URI[gtk.sha256sum] = "8ea7e11ff88e9a8867b7d9221d40a3bfce5c648ce27cd6bac422ff8f6cca414d"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 BBCLASSEXTEND = "native"
 

diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
index b0c5230..c7efb29 100644 (file)
--- a/recipes/gtk+/gtk+_2.20.1.bb
+++ b/recipes/gtk+/gtk+_2.20.1.bb
@@ -2,12 +2,14 @@ require gtk+.inc
 
 SRC_URI_append_virtclass-native = " file://no-demos.patch \
 "
-SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch"
+SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
+                 file://cross-nm.patch \
+                "
 
 SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
 SRC_URI[gtk.sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 BBCLASSEXTEND = "native"