Patchwork [1/1] libx11-diet: Fix bug 1050

login
register
mail settings
Submitter Xiaofeng Yan
Date Aug. 12, 2011, 7:06 a.m.
Message ID <e43470acc45e0b2d15a3fdc54a5db92f2486f616.1313117148.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/9699/
State New, archived
Headers show

Comments

Xiaofeng Yan - Aug. 12, 2011, 7:06 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

[YOCTO #1050]
I got do_compile failure during building qemux86 image
| ../../../doltlibtool: line 17:
/distro/dcui/0704/pc1/build/tmp/work/i586-poky-linux/libx11-diet-1.3-r2/libX11-1.3/modules/im/ximcp/../../../libtool:
No such file or directory

This is due to not found libtool, but i586-poky-linux-libtool in libX11-1.3
So I link libtool to ${TARGET_PREFIX}libtool for solving this problem.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-graphics/xorg-lib/libx11.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
Richard Purdie - Aug. 12, 2011, 4:39 p.m.
On Fri, 2011-08-12 at 15:06 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> [YOCTO #1050]
> I got do_compile failure during building qemux86 image
> | ../../../doltlibtool: line 17:
> /distro/dcui/0704/pc1/build/tmp/work/i586-poky-linux/libx11-diet-1.3-r2/libX11-1.3/modules/im/ximcp/../../../libtool:
> No such file or directory
> 
> This is due to not found libtool, but i586-poky-linux-libtool in libX11-1.3
> So I link libtool to ${TARGET_PREFIX}libtool for solving this problem.
> 
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
>  meta/recipes-graphics/xorg-lib/libx11.inc |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
> index c156ce6..dbc50f8 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11.inc
> +++ b/meta/recipes-graphics/xorg-lib/libx11.inc
> @@ -18,6 +18,12 @@ EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-sp
>  FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
>  FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
>  
> +do_configure_append() {
> +    if [ -f ${TARGET_PREFIX}libtool ]; then
> +        ln -sf ${TARGET_PREFIX}libtool libtool
> +    fi
> +}
> +

Please just disable dolt as per the other libx11 recipes.

Cheers,

Richard

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index c156ce6..dbc50f8 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -18,6 +18,12 @@  EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-sp
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
 FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
+do_configure_append() {
+    if [ -f ${TARGET_PREFIX}libtool ]; then
+        ln -sf ${TARGET_PREFIX}libtool libtool
+    fi
+}
+
 do_compile() {
 	cd ${S}/src/util
 	mv makekeys.c.orig makekeys.c || true