summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-03 10:02:16 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-03 10:02:16 +0000
commita953836f2e007e37df2094368069e87cefa73092 (patch)
tree8c1d425e64849e307e58e1363a21300285732410 /meta
parentdddac8f2c337d364135fd7202c358dbf224a321a (diff)
downloadopenembedded-core-a953836f2e007e37df2094368069e87cefa73092.tar.gz
openembedded-core-a953836f2e007e37df2094368069e87cefa73092.tar.bz2
openembedded-core-a953836f2e007e37df2094368069e87cefa73092.tar.xz
openembedded-core-a953836f2e007e37df2094368069e87cefa73092.zip
libxt: Use STAGING_INCDIR_NATIVE, not STAGING_INCDIR. Also fix error handling.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5406 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xorg-lib/libxt_1.0.5.bb9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/packages/xorg-lib/libxt_1.0.5.bb b/meta/packages/xorg-lib/libxt_1.0.5.bb
index 80c7bf17b..504779933 100644
--- a/meta/packages/xorg-lib/libxt_1.0.5.bb
+++ b/meta/packages/xorg-lib/libxt_1.0.5.bb
@@ -12,8 +12,11 @@ EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"
do_compile() {
(
- unset CC LD CXX CCLD
- oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
- ) || exit 1
+ unset CC LD CXX CCLD CFLAGS
+ oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+ )
+ if [ "$?" != "0" ]; then
+ exit 1
+ fi
oe_runmake
}