summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-11-17 10:36:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-24 22:12:03 (GMT)
commita87ec92d98dd6c28be8cc9dba7321bd94663c2d8 (patch)
tree0e492bd3b3f84a1a0a3c275168998fd577c92362 /meta/recipes-gnome
parente04de73421b05d76f9b92f064598f954445b9cc8 (diff)
downloadpoky-a87ec92d98dd6c28be8cc9dba7321bd94663c2d8.tar.gz
gtk+: Have gtk+ pick up ${NM} from the environment
when gtk+ configures, it should pick up ${NM} from the environment \ if it is defined, instead of just looking for "nm". (From OE-Core rev: 7cb5063d8bc59534dc64b19164cb9bdf0c04c68b) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch14
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.6.bb3
2 files changed, 16 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch
new file mode 100644
index 0000000..5aeef50
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Inappropriate [configuration]
2Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com>
3# Pick up ${NM} from the environment
4--- a/configure.in
5+++ b/configure.in
6@@ -190,7 +190,7 @@
7 AC_SYS_LARGEFILE
8
9 AM_PROG_AS
10-AC_PATH_PROG(NM, nm, nm)
11+AC_CHECK_TOOLS(NM, [$NM nm], nm)
12
13 dnl Initialize maintainer mode
14 AM_MAINTAINER_MODE
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
index cd5c8cb..ade0a2d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
7SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \ 7SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
8 file://xsettings.patch \ 8 file://xsettings.patch \
9 file://run-iconcache.patch \ 9 file://run-iconcache.patch \
10 file://configure-nm.patch \
10 file://hardcoded_libtool.patch \ 11 file://hardcoded_libtool.patch \
11 file://no-demos.patch \ 12 file://no-demos.patch \
12 file://cellrenderer-cairo.patch;striplevel=0 \ 13 file://cellrenderer-cairo.patch;striplevel=0 \
@@ -26,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
26# file://combo-arrow-size.patch;striplevel=0 27# file://combo-arrow-size.patch;striplevel=0
27# file://configurefix.patch 28# file://configurefix.patch
28 29
29PR = "r1" 30PR = "r2"
30 31
31SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe" 32SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe"
32SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37" 33SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37"