summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-f8df3fc3417ac4e1ba3688a1e66c8165cf459047.tar.gz
openembedded-core-f8df3fc3417ac4e1ba3688a1e66c8165cf459047.tar.bz2
openembedded-core-f8df3fc3417ac4e1ba3688a1e66c8165cf459047.tar.xz
openembedded-core-f8df3fc3417ac4e1ba3688a1e66c8165cf459047.zip
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 f4f52fdf7..8245cd1d0 100644
--- a/meta/packages/xorg-lib/libx11.inc
+++ b/meta/packages/xorg-lib/libx11.inc
@@ -9,15 +9,19 @@ LEAD_SONAME = "libX11.so"
EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
do_compile() {
+ cd ${S}/src/util
+ mv makekeys.c.orig makekeys.c || true
+ touch makekeys-makekeys.o
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
- cd src/util;
- mv makekeys.c.orig makekeys.c || true
- 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 ../../
- ) || exit 1
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+ )
+ if [ "$?" != "0" ]; then
+ exit 1
+ fi
+ # mv to stop it getting rebuilt
+ mv makekeys.c makekeys.c.orig
+ cd ${S}
oe_runmake
}