diff options
author | Richard Purdie <richard@openedhand.com> | 2008-10-03 10:02:16 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-10-03 10:02:16 +0000 |
commit | a953836f2e007e37df2094368069e87cefa73092 (patch) | |
tree | 8c1d425e64849e307e58e1363a21300285732410 | |
parent | dddac8f2c337d364135fd7202c358dbf224a321a (diff) | |
download | poky-a953836f2e007e37df2094368069e87cefa73092.tar.gz |
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
-rw-r--r-- | meta/packages/xorg-lib/libxt_1.0.5.bb | 9 |
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 80c7bf17b3..504779933f 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" | |||
12 | 12 | ||
13 | do_compile() { | 13 | do_compile() { |
14 | ( | 14 | ( |
15 | unset CC LD CXX CCLD | 15 | unset CC LD CXX CCLD CFLAGS |
16 | 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 | 16 | 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 |
17 | ) || exit 1 | 17 | ) |
18 | if [ "$?" != "0" ]; then | ||
19 | exit 1 | ||
20 | fi | ||
18 | oe_runmake | 21 | oe_runmake |
19 | } | 22 | } |