[OC-core][PATCH 0/1] libx11-diet: Fix bug 1050

[OC-core][PATCH 0/1] libx11-diet: Fix bug 1050

[Xiaofeng Yan]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Hi Richard,
I just disable dolt according to your suggestion.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: xiaofeng/libx11-diet
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/libx11-diet

Thanks,
    Xiaofeng Yan <xiaofeng.yan@windriver.com>
---


Xiaofeng Yan (1):
  libx11-diet: Fix bug 1050

 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

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

[Xiaofeng Yan]

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 disable dolt for solving this problem.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index a4929d2..487e796 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -5,13 +5,14 @@ this version."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://x11_disable_makekeys.patch \
             file://include_fix.patch \
             file://X18NCMSstubs.diff \
             file://fix-disable-xlocale.diff \
-            file://fix-utf8-wrong-define.patch"
+            file://fix-utf8-wrong-define.patch \
+            file://nodolt.patch"
 
 DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-- 
1.7.0.4

Re: [OC-core][PATCH 0/1] libx11-diet: Fix bug 1050

[Richard Purdie]

On Mon, 2011-08-15 at 18:27 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> Hi Richard,
> I just disable dolt according to your suggestion.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: xiaofeng/libx11-diet
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/libx11-diet
> 
> Thanks,
>     Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> 
> 
> Xiaofeng Yan (1):
>   libx11-diet: Fix bug 1050

Merged to master, thanks.

Richard