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

1 files changed, 2 insertions, 1 deletions

diff --git a/meta/packages/xorg-lib/libx11_1.1.4.bb b/meta/packages/xorg-lib/libx11_1.1.4.bb
index 615cfb6686..492cc4106b 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 ../../