From 3b0dbf13c1f7e06597ba0c2e18345317b5b7298c Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Mon, 6 Aug 2007 11:57:26 +0000
Subject: packages/xorg-lib/libx11_1.1.2.bb : Fix an issue when building for
 Efika, where it used target toolchain to build makekeys which is need to run
 on the host

---
 packages/xorg-lib/libx11_1.1.2.bb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'packages/xorg-lib')

diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index bab2277fd0..e6b0ec5d8b 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,17 +5,19 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
+PR = "r1"
 
 XORG_PN = "libX11"
 
 EXTRA_OECONF += "--without-xcb"
 
 do_compile() {
-	(
-		unset CC LD CXX CCLD
-		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-	)
-	oe_runmake
+        (
+         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+         cd ../../
+        ) || exit 1
+        oe_runmake
 }
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-- 
cgit 1.2.3-korg