summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJames Limbouris <james@digitalmatter.com.au>2012-03-08 01:44:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-08 19:55:39 (GMT)
commit7172b4b012e8a8d6827a69bdab5f4eb232178e1a (patch)
treeaed34c1b6b0ed0f7681589fc7b8d8417ff1a2324 /meta/recipes-gnome
parent31a03ed08d7e9985c4d5f5693ca7e5e31354708f (diff)
downloadpoky-7172b4b012e8a8d6827a69bdab5f4eb232178e1a.tar.gz
gdk-pixbuf: Pick up ${NM} from the environment.
(From OE-Core rev: e48eb65494a234ac82ec04fcbcc04f5e881347c3) Signed-off-by: James Limbouris <james@digitalmatter.com.au> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch21
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb3
2 files changed, 23 insertions, 1 deletions
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..54f7c3a
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
@@ -0,0 +1,21 @@
1Pick up ${NM} from the environment.
2
3Upstream-Status: Pending
4https://bugzilla.gnome.org/show_bug.cgi?id=671516
5
6Signed-off-by: James Limbouris <james@digitalmatter.com.au>
7
8Index: gdk-pixbuf-2.24.0/configure.ac
9===================================================================
10diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac
11--- gdk-pixbuf-2.24.0/configure.ac 2011-08-27 11:27:52.000000000 +0800
12+++ gdk-pixbuf-2.24.0.mod/configure.ac 2012-02-28 14:48:36.481126410 +0800
13@@ -147,7 +147,7 @@
14 AC_SYS_LARGEFILE
15
16 AM_PROG_AS
17-AC_PATH_PROG(NM, nm, nm)
18+AC_CHECK_TOOLS(NM, [$NM nm], nm)
19
20 AC_MSG_CHECKING([for some Win32 platform])
21 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 0e2067a..cbeca94 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"
11DEPENDS = "libpng glib-2.0 jpeg" 11DEPENDS = "libpng glib-2.0 jpeg"
12 12
13SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \ 13SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
14 file://configure_nm.patch \
14 file://hardcoded_libtool.patch \ 15 file://hardcoded_libtool.patch \
15 file://configure_fix.patch \ 16 file://configure_fix.patch \
16 " 17 "
@@ -18,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
18SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8" 19SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"
19SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700" 20SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700"
20 21
21PR = "r4" 22PR = "r5"
22 23
23inherit autotools pkgconfig gettext 24inherit autotools pkgconfig gettext
24 25