diff options
| author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-11-17 18:36:50 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-24 22:09:20 +0000 |
| commit | 7cb5063d8bc59534dc64b19164cb9bdf0c04c68b (patch) | |
| tree | ffeb5f1841ab1c291888e68e2fab2e6ccf49b949 /meta/recipes-gnome | |
| parent | 61928384b91f7328aaa72c6d1299d8598c24574d (diff) | |
| download | openembedded-core-7cb5063d8bc59534dc64b19164cb9bdf0c04c68b.tar.gz openembedded-core-7cb5063d8bc59534dc64b19164cb9bdf0c04c68b.tar.bz2 openembedded-core-7cb5063d8bc59534dc64b19164cb9bdf0c04c68b.zip | |
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".
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 3 |
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 0000000000..5aeef5074e --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [configuration] +Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com> +# Pick up ${NM} from the environment +--- a/configure.in ++++ b/configure.in +@@ -190,7 +190,7 @@ + AC_SYS_LARGEFILE + + AM_PROG_AS +-AC_PATH_PROG(NM, nm, nm) ++AC_CHECK_TOOLS(NM, [$NM nm], nm) + + dnl Initialize maintainer mode + 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 cd5c8cb116..ade0a2da32 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 \ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \ file://xsettings.patch \ file://run-iconcache.patch \ + file://configure-nm.patch \ file://hardcoded_libtool.patch \ file://no-demos.patch \ file://cellrenderer-cairo.patch;striplevel=0 \ @@ -26,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \ # file://combo-arrow-size.patch;striplevel=0 # file://configurefix.patch -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe" SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37" |