Patchwork [2/4] gdk-pixbuf: pick up ${NM} to fix libtool naming issue

login
register
mail settings
Submitter Kang Kai
Date Oct. 13, 2011, 9:05 a.m.
Message ID <c5043e9c181631b290bf33c770940594efdc9647.1318496401.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/13089/
State New, archived
Headers show

Comments

Kang Kai - Oct. 13, 2011, 9:05 a.m.
When gdk-pixbuf configures, it should pick up ${NM} from the
environment if it is defined, instead of just looking
for "nm".

The patch is from WindRiver Linux.
CQID:  WIND00260200

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 .../gdk-pixbuf-2.24.0/configure-nm.patch           |   32 ++++++++++++++++++++
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    3 ++
 2 files changed, 35 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
Khem Raj - Oct. 14, 2011, midnight
On Thu, Oct 13, 2011 at 2:05 AM, Kang Kai <kai.kang@windriver.com> wrote:
> When gdk-pixbuf configures, it should pick up ${NM} from the
> environment if it is defined, instead of just looking
> for "nm".
>
> The patch is from WindRiver Linux.
> CQID:  WIND00260200
>
> Signed-off-by: Kang Kai <kai.kang@windriver.com>
> ---
>  .../gdk-pixbuf-2.24.0/configure-nm.patch           |   32 ++++++++++++++++++++
>  meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    3 ++
>  2 files changed, 35 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
>
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
> new file mode 100644
> index 0000000..71defd0
> --- /dev/null
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
> @@ -0,0 +1,32 @@
> +This patch is from WindRiver Linux, to fix libtool naming issue.
> +The original commit info is:
> +
> +commit 684b9d2daab517856222cc078ac51c72ce3ca3a9
> +Author: David Borman <david.borman@windriver.com>
> +Date:   Thu Mar 10 07:51:11 2011 -0600
> +
> +    Have gdk-pixbuf pick up ${NM}, fix libtool naming issue
> +
> +    CQID: WIND00260200
> +
> +    The configuration for gdk-pixbuf needs to pick up $NM
> +    from the environment, this is the same patch that was
> +    applied to gdk+.
> +
> +    Signed-off-by: David Borman <david.borman@windriver.com>
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Kang Kai <kai.kang@windriver.com>
> +
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -149,7 +149,7 @@
> + AC_SYS_LARGEFILE
> +
> + AM_PROG_AS
> +-AC_PATH_PROG(NM, nm, nm)
> ++AC_PATH_PROG(NM, [$NM nm], nm)

Does

 AC_PATH_TOOL(NM,nm,nm)

work for you here ?

> +
> + AC_MSG_CHECKING([for some Win32 platform])
> + AS_CASE(["$host"],
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> index 9fabbe2..2099b98 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> @@ -10,9 +10,12 @@ SECTION = "libs"
>
>  DEPENDS = "libpng glib-2.0 jpeg"
>
> +PR = "r1"
> +
>  SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
>            file://hardcoded_libtool.patch \
>            file://configure_fix.patch \
> +           file://configure-nm.patch;patch=1 \

patch=1 is redundant

>            "
>
>  SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"
> --
> 1.7.5.1.300.gc565c
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
new file mode 100644
index 0000000..71defd0
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure-nm.patch
@@ -0,0 +1,32 @@ 
+This patch is from WindRiver Linux, to fix libtool naming issue.
+The original commit info is:
+
+commit 684b9d2daab517856222cc078ac51c72ce3ca3a9
+Author: David Borman <david.borman@windriver.com>
+Date:   Thu Mar 10 07:51:11 2011 -0600
+
+    Have gdk-pixbuf pick up ${NM}, fix libtool naming issue
+    
+    CQID: WIND00260200
+    
+    The configuration for gdk-pixbuf needs to pick up $NM
+    from the environment, this is the same patch that was
+    applied to gdk+.
+    
+    Signed-off-by: David Borman <david.borman@windriver.com>
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <kai.kang@windriver.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,7 +149,7 @@
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_PATH_PROG(NM, [$NM nm], nm)
+ 
+ AC_MSG_CHECKING([for some Win32 platform])
+ AS_CASE(["$host"],
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 9fabbe2..2099b98 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -10,9 +10,12 @@  SECTION = "libs"
 
 DEPENDS = "libpng glib-2.0 jpeg"
 
+PR = "r1"
+
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
            file://hardcoded_libtool.patch \
            file://configure_fix.patch \
+           file://configure-nm.patch;patch=1 \
            "
 
 SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"