mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

libx11.inc: Fix error handling logic for makekeys generation

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5330 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-09-29 21:59:09 +00:00
parent 287ef55e47
commit f8df3fc341
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/xorg-lib/libx11.inc
+11 -7
View File
@@ -9,15 +9,19 @@ LEAD_SONAME = "libX11.so"
EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
do_compile() { 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 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
cd src/util; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
mv makekeys.c.orig makekeys.c || true )
touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys if [ "$?" != "0" ]; then
# mv to stop it getting rebuilt exit 1
mv makekeys.c makekeys.c.orig fi
cd ../../ # mv to stop it getting rebuilt
) || exit 1 mv makekeys.c makekeys.c.orig
cd ${S}
oe_runmake oe_runmake
} }