gtk+:Have gtk+ pick up ${NM} from the environment

PATCH Applied Xiaofeng Yan 3 participants 5 messages Nov 17, 2011 – Nov 25, 2011

lore

Share & tools

lore

Xiaofeng Yan

author

2011-11-17 11:23 UTC #0 lore raw

cover gtk+:Have gtk+ pick up ${NM} from the environment

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>
---

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

Xiaofeng Yan

author

2011-11-17 11:23 UTC #1 lore raw

PATCH 1/1 gtk+: Have gtk+ pick up ${NM} from the environment

From: Xiaofeng Yan <[email protected]>

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 <[email protected]>

---
 .../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

meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch new file +14 -0

new file mode 100644
index 0000000..5aeef50
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [configuration]
+Signed-Off-By: Xiaofeng Yan <[email protected]>
+# 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

meta/recipes-gnome/gtk+/gtk+_2.24.6.bb +2 -1

index cd5c8cb..ade0a2d 100644
@@ -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"

Signature · 1 line

1.7.0.4

Saul Wold

2011-11-22 18:56 UTC #2 lore raw

Re: [PATCH 1/1] gtk+: Have gtk+ pick up ${NM} from the environment

Quoted 18 lines · Xiaofeng Yan

From: Xiaofeng Yan<[email protected]>
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<[email protected]>
---
  .../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
meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch new file +0 -0
new file mode 100644
index 0000000..5aeef50

meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch line 1

Quoted 1 line

meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch new file +1 -0
@@ -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!

Quoted 34 lines

meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch new file +13 -0

+Signed-Off-By: Xiaofeng Yan<[email protected]>
+# 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

meta/recipes-gnome/gtk+/gtk+_2.24.6.bb +2 -1

index cd5c8cb..ade0a2d 100644
@@ -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"

Xiaofeng Yan

author

2011-11-23 09:12 UTC #3 lore raw

Re: [PATCH 1/1] gtk+: Have gtk+ pick up ${NM} from the environment

Quoted 22 lines · Saul Wold

Quoted 18 lines · Xiaofeng Yan
From: Xiaofeng Yan<[email protected]>
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<[email protected]>
---
.../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
meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch new file +0 -0
new file mode 100644
index 0000000..5aeef50
meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch line 1
Quoted 1 line
meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch new file +1 -0
@@ -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.

Quoted 2 lines

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

Quoted 37 lines

Quoted 36 lines

meta/recipes-gnome/gtk+/gtk+-2.24.6/configure-nm.patch new file +13 -0

+Signed-Off-By: Xiaofeng Yan<[email protected]>
+# 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

meta/recipes-gnome/gtk+/gtk+_2.24.6.bb +1 -0

index cd5c8cb..ade0a2d 100644
@@ -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 \

meta/recipes-gnome/gtk+/gtk+_2.24.6.bb +1 -1

@@ -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"

Richard Purdie

Applied

2011-11-25 00:11 UTC #4 lore raw

Re: [PATCH 1/1] gtk+: Have gtk+ pick up ${NM} from the environment

In reply to Xiaofeng Yan

Quoted 11 lines · Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>
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 <[email protected]>
---
 .../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