From patchwork Tue Feb 28 07:36:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: gdk-pixbuf: Pick up ${NM} from the environment. Date: Tue, 28 Feb 2012 07:36:59 -0000 From: James Limbouris X-Patchwork-Id: 22287 Message-Id: <1330414619-21016-1-git-send-email-james@digitalmatter.com.au> To: openembedded-core@lists.openembedded.org Signed-off-by: James Limbouris --- .../gdk-pixbuf-2.24.0/configure_nm.patch | 19 +++++++++++++++++++ meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch 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 0000000..1697967 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch @@ -0,0 +1,19 @@ +At this stage of configure, ${NM} has already been correctly set. +This AC_PATH_PROG overwrites the correct path with a host path. + +Upstream-Status: Inappropriate [configuration] +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,6 @@ + AC_SYS_LARGEFILE + + AM_PROG_AS +-AC_PATH_PROG(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 121babd..d75bf2a 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