* [PATCH 0/1] gtk+:Have gtk+ pick up ${NM} from the environment
@ 2011-11-17 11:16 Xiaofeng Yan
2011-11-17 11:16 ` [PATCH 1/1] gtk+: Have " Xiaofeng Yan
0 siblings, 1 reply; 5+ messages in thread
From: Xiaofeng Yan @ 2011-11-17 11:16 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
When gtk+ configures, it should pick up ${NM} from the environment if it is defined, instead of just looking for "nm".
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/gtk+
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/gtk+
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
gtk+: Have gtk+ pick up ${NM} from the environment
.../gtk+/gtk+-2.24.6/configure-nm.patch | 14 ++++++++++++++
meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 3 ++-
2 files changed, 16 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/1] gtk+: Have gtk+ pick up ${NM} from the environment 2011-11-17 11:16 [PATCH 0/1] gtk+:Have gtk+ pick up ${NM} from the environment Xiaofeng Yan @ 2011-11-17 11:16 ` Xiaofeng Yan 2011-11-22 18:50 ` Saul Wold 2011-11-25 0:04 ` Richard Purdie 0 siblings, 2 replies; 5+ messages in thread From: Xiaofeng Yan @ 2011-11-17 11:16 UTC (permalink / raw) To: openembedded-core From: Xiaofeng Yan <xiaofeng.yan@windriver.com> hen 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> --- .../gtk+/gtk+-2.24.6/configure-nm.patch | 14 ++++++++++++++ meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 3 ++- 2 files changed, 16 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch 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 @@ +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 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 \ 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" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] gtk+: Have gtk+ pick up ${NM} from the environment 2011-11-17 11:16 ` [PATCH 1/1] gtk+: Have " Xiaofeng Yan @ 2011-11-22 18:50 ` Saul Wold 2011-11-23 9:04 ` Xiaofeng Yan 2011-11-25 0:04 ` Richard Purdie 1 sibling, 1 reply; 5+ messages in thread From: Saul Wold @ 2011-11-22 18:50 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 11/17/2011 03:16 AM, Xiaofeng Yan wrote: > From: Xiaofeng Yan<xiaofeng.yan@windriver.com> > > hen 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> > --- > .../gtk+/gtk+-2.24.6/configure-nm.patch | 14 ++++++++++++++ > meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 3 ++- > 2 files changed, 16 insertions(+), 1 deletions(-) > create mode 100644 meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch > > 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 @@ > +Upstream-Status: Inappropriate [configuration] I am not sure I would agree here, I think that the upstream might be interested in having a cross-compilation fix. Sau! > +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 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 \ > 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" ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] gtk+: Have gtk+ pick up ${NM} from the environment 2011-11-22 18:50 ` Saul Wold @ 2011-11-23 9:04 ` Xiaofeng Yan 0 siblings, 0 replies; 5+ messages in thread From: Xiaofeng Yan @ 2011-11-23 9:04 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer On 2011年11月23日 02:50, Saul Wold wrote: > On 11/17/2011 03:16 AM, Xiaofeng Yan wrote: >> From: Xiaofeng Yan<xiaofeng.yan@windriver.com> >> >> hen 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> >> --- >> .../gtk+/gtk+-2.24.6/configure-nm.patch | 14 ++++++++++++++ >> meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 3 ++- >> 2 files changed, 16 insertions(+), 1 deletions(-) >> create mode 100644 >> meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch >> >> 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 @@ >> +Upstream-Status: Inappropriate [configuration] > I am not sure I would agree here, I think that the upstream might be > interested in having a cross-compilation fix. > > Sau! > Hi Saul, Thanks for your comment. gtk use "/usr/bin/nm" at current status by testing. if using "AC_CHECK_TOOLS(NM, [$NM nm], nm) ", it will use "xxx-nm" under sysroot. So I think this patch can avoid this problem. If you think it is not necessary for OE-core, I will submit this patch to upstream if possible. Thanks Yan >> +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 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 \ >> 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" > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] gtk+: Have gtk+ pick up ${NM} from the environment 2011-11-17 11:16 ` [PATCH 1/1] gtk+: Have " Xiaofeng Yan 2011-11-22 18:50 ` Saul Wold @ 2011-11-25 0:04 ` Richard Purdie 1 sibling, 0 replies; 5+ messages in thread From: Richard Purdie @ 2011-11-25 0:04 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2011-11-17 at 19:16 +0800, Xiaofeng Yan wrote: > From: Xiaofeng Yan <xiaofeng.yan@windriver.com> > > hen 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> > --- > .../gtk+/gtk+-2.24.6/configure-nm.patch | 14 ++++++++++++++ > meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 3 ++- > 2 files changed, 16 insertions(+), 1 deletions(-) > create mode 100644 meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch Merged to master, thanks. Richard ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-25 0:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-17 11:16 [PATCH 0/1] gtk+:Have gtk+ pick up ${NM} from the environment Xiaofeng Yan
2011-11-17 11:16 ` [PATCH 1/1] gtk+: Have " Xiaofeng Yan
2011-11-22 18:50 ` Saul Wold
2011-11-23 9:04 ` Xiaofeng Yan
2011-11-25 0:04 ` Richard Purdie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox