From 16e8921c687e2d9bfdb0a46cd46186b159dd792e Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 1 May 2008 12:31:19 +0000
Subject: libx11: Fix do_compile hack to use native headers and allow
 do_compile to run more than once

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4391 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-lib/libx11_1.1.4.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/packages/xorg-lib/libx11_1.1.4.bb b/meta/packages/xorg-lib/libx11_1.1.4.bb
index 615cfb668..492cc4106 100644
--- a/meta/packages/xorg-lib/libx11_1.1.4.bb
+++ b/meta/packages/xorg-lib/libx11_1.1.4.bb
@@ -17,7 +17,8 @@ EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.
 do_compile() {
 	(
 		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR} makekeys.c -o makekeys
+		mv makekeys.c.orig makekeys.c || true
+		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
 		# mv to stop it getting rebuilt
 		mv makekeys.c makekeys.c.orig
 		cd ../../
-- 
cgit v1.2.3