summaryrefslogtreecommitdiff
path: root/meta/packages/xorg-lib
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-01 12:31:19 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-01 12:31:19 +0000
commit16e8921c687e2d9bfdb0a46cd46186b159dd792e (patch)
tree14596d440c6599c78981bec22cf215c6d72dc3c7 /meta/packages/xorg-lib
parentb1108124b16bc8b6eced40319cafd79c6ef1d016 (diff)
downloadopenembedded-core-16e8921c687e2d9bfdb0a46cd46186b159dd792e.tar.gz
openembedded-core-16e8921c687e2d9bfdb0a46cd46186b159dd792e.tar.bz2
openembedded-core-16e8921c687e2d9bfdb0a46cd46186b159dd792e.zip
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
Diffstat (limited to 'meta/packages/xorg-lib')
-rw-r--r--meta/packages/xorg-lib/libx11_1.1.4.bb3
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 ../../