diff options
| -rw-r--r-- | meta/packages/xorg-lib/libx11.inc | 18 |
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 } |