On 2011年11月23日 02:50, Saul Wold wrote:
On 11/17/2011 03:16 AM, Xiaofeng Yan wrote:
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
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<[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
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"
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
