summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-29 21:59:09 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-29 21:59:09 +0000
commitf8df3fc3417ac4e1ba3688a1e66c8165cf459047 (patch)
treeeea323ede32600ce613240704b9c1254a5a2fef2 /meta
parent287ef55e47aa1f0988f41ba443ddccac51afd488 (diff)
downloadpoky-f8df3fc3417ac4e1ba3688a1e66c8165cf459047.tar.gz
libx11.inc: Fix error handling logic for makekeys generation
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5330 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xorg-lib/libx11.inc18
1 files changed, 11 insertions, 7 deletions
diff --git a/meta/packages/xorg-lib/libx11.inc b/meta/packages/xorg-lib/libx11.inc
index f4f52fdf7e..8245cd1d08 100644
--- a/meta/packages/xorg-lib/libx11.inc
+++ b/meta/packages/xorg-lib/libx11.inc
@@ -9,15 +9,19 @@ LEAD_SONAME = "libX11.so"
9EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" 9EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
10 10
11do_compile() { 11do_compile() {
12 cd ${S}/src/util
13 mv makekeys.c.orig makekeys.c || true
14 touch makekeys-makekeys.o
12 ( 15 (
13 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS 16 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
14 cd src/util; 17 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
15 mv makekeys.c.orig makekeys.c || true 18 )
16 touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys 19 if [ "$?" != "0" ]; then
17 # mv to stop it getting rebuilt 20 exit 1
18 mv makekeys.c makekeys.c.orig 21 fi
19 cd ../../ 22 # mv to stop it getting rebuilt
20 ) || exit 1 23 mv makekeys.c makekeys.c.orig
24 cd ${S}
21 oe_runmake 25 oe_runmake
22} 26}
23 27