[PATCH 1/2] matchbox-stroke: Fix linking error with gold

[PATCH 1/2] matchbox-stroke: Fix linking error with gold

[Khem Raj]

Gold defaults to no-add-needed thetefore
it does not link with librtaries that are not on cmdline
it needs libXrender but is not on the linker cmdline
so add it.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../matchbox-stroke/files/ldadd_libXrender.patch   |   25 ++++++++++++++++++++
 .../matchbox-stroke/matchbox-stroke_git.bb         |    6 +++-
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/matchbox-stroke/files/ldadd_libXrender.patch

diff --git a/meta/recipes-sato/matchbox-stroke/files/ldadd_libXrender.patch b/meta/recipes-sato/matchbox-stroke/files/ldadd_libXrender.patch
new file mode 100644
index 0000000..90d2057
--- /dev/null
+++ b/meta/recipes-sato/matchbox-stroke/files/ldadd_libXrender.patch
@@ -0,0 +1,25 @@
+with GNU binutils-gold the
+important difference is that --no-add-needed is the default behavior of GNU
+binutils-gold. Please provide all needed libraries to the linker when building
+your executables.
+
+Otherwise we get link errors like
+
+/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/4.6.2/ld: matchbox-stroke-ui.o: in function mb_stroke_ui_resources_create:matchbox-stroke-ui.c:223: error: undefined reference to 'XRenderCreatePicture'collect2: ld returned 1 exit statusmake[2]: *** [matchbox-stroke] Error 1
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: git/src/Makefile.am
+===================================================================
+--- git.orig/src/Makefile.am	2011-10-22 19:25:52.000000000 -0700
++++ git/src/Makefile.am	2011-10-22 19:27:07.746428946 -0700
+@@ -6,7 +6,7 @@
+ 
+ bin_PROGRAMS = matchbox-stroke
+ 
+-matchbox_stroke_LDADD = $(MBSTROKE_LIBS) $(EXPAT_LIBS) -lm
++matchbox_stroke_LDADD = $(MBSTROKE_LIBS) $(EXPAT_LIBS) -lm -lXrender
+ 
+ matchbox_stroke_SOURCES =                                          \
+        matchbox-stroke.h                                           \
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
index 44b316d..2c2e940 100644
--- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_git.bb
@@ -9,11 +9,13 @@ DEPENDS = "libfakekey expat libxft"
 SECTION = "x11/wm"
 SRCREV = "8edfd9a2bf1f0d6b28d4afee4bda9d3635f26a0b"
 PV = "0.0+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
            file://single-instance.patch \
-           file://configure_fix.patch;maxrev=1819"
+           file://configure_fix.patch;maxrev=1819 \
+           file://ldadd_libXrender.patch \
+          "
 
 S = "${WORKDIR}/git"
 
-- 
1.7.5.4

[PATCH 2/2] pulseaudio: inherit perlnative

[Khem Raj]

manpage generatition uses xmltoman utility
which inturn uses xml-parser. So we add
libxml-parser-perl-native to DEPENDS and also
inherit perlnative so it does not use the one
from build host

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../pulseaudio/pulseaudio_0.9.23.bb                |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
index 33f5e15..9521ab0 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
@@ -1,10 +1,10 @@
 require pulseaudio.inc
 
-PR = "r5"
+PR = "r6"
 
-DEPENDS += "gdbm speex"
+DEPENDS += "gdbm speex libxml-parser-perl-native"
 
-inherit gettext
+inherit gettext perlnative
 
 SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.gz \
   file://buildfix.patch \
-- 
1.7.5.4

Re: [PATCH 2/2] pulseaudio: inherit perlnative

[Saul Wold]

On 10/23/2011 07:31 AM, Khem Raj wrote:
> manpage generatition uses xmltoman utility
> which inturn uses xml-parser. So we add
> libxml-parser-perl-native to DEPENDS and also
> inherit perlnative so it does not use the one
> from build host
>
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
>   .../pulseaudio/pulseaudio_0.9.23.bb                |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> index 33f5e15..9521ab0 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> @@ -1,10 +1,10 @@
>   require pulseaudio.inc
>
> -PR = "r5"
> +PR = "r6"
>
> -DEPENDS += "gdbm speex"
> +DEPENDS += "gdbm speex libxml-parser-perl-native"
>
> -inherit gettext
> +inherit gettext perlnative
>
>   SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.gz \
>     file://buildfix.patch \
This patch is already out there from Martin, I just submitted it in a 
CONSOLIDATED PULL.

Sau!

Re: [PATCH 2/2] pulseaudio: inherit perlnative

[Richard Purdie]

On Sun, 2011-10-23 at 07:31 -0700, Khem Raj wrote:
> manpage generatition uses xmltoman utility
> which inturn uses xml-parser. So we add
> libxml-parser-perl-native to DEPENDS and also
> inherit perlnative so it does not use the one
> from build host
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../pulseaudio/pulseaudio_0.9.23.bb                |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard