From 7172b4b012e8a8d6827a69bdab5f4eb232178e1a Mon Sep 17 00:00:00 2001 From: James Limbouris Date: Thu, 8 Mar 2012 09:44:02 +0800 Subject: gdk-pixbuf: Pick up ${NM} from the environment. (From OE-Core rev: e48eb65494a234ac82ec04fcbcc04f5e881347c3) Signed-off-by: James Limbouris Signed-off-by: Richard Purdie --- .../gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch | 21 +++++++++++++++++++++ meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch new file mode 100644 index 0000000000..54f7c3ad0d --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch @@ -0,0 +1,21 @@ +Pick up ${NM} from the environment. + +Upstream-Status: Pending +https://bugzilla.gnome.org/show_bug.cgi?id=671516 + +Signed-off-by: James Limbouris + +Index: gdk-pixbuf-2.24.0/configure.ac +=================================================================== +diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac +--- gdk-pixbuf-2.24.0/configure.ac 2011-08-27 11:27:52.000000000 +0800 ++++ gdk-pixbuf-2.24.0.mod/configure.ac 2012-02-28 14:48:36.481126410 +0800 +@@ -147,7 +147,7 @@ + AC_SYS_LARGEFILE + + AM_PROG_AS +-AC_PATH_PROG(NM, nm, nm) ++AC_CHECK_TOOLS(NM, [$NM nm], nm) + + AC_MSG_CHECKING([for some Win32 platform]) + AS_CASE(["$host"], diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb index 0e2067a4e0..cbeca949fb 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb @@ -11,6 +11,7 @@ SECTION = "libs" DEPENDS = "libpng glib-2.0 jpeg" SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \ + file://configure_nm.patch \ file://hardcoded_libtool.patch \ file://configure_fix.patch \ " @@ -18,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${ SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8" SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700" -PR = "r4" +PR = "r5" inherit autotools pkgconfig gettext -- cgit v1.2.3-54-g00ecf