1 files changed, 12 insertions, 5 deletions

diff --git a/meta/packages/xorg-lib/libx11_1.1.2.bb b/meta/packages/xorg-lib/libx11_1.1.2.bb
index bab2277fd0..93ad71f466 100644
--- a/meta/packages/xorg-lib/libx11_1.1.2.bb
+++ b/meta/packages/xorg-lib/libx11_1.1.2.bb
@@ -5,17 +5,24 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
+PR = "r2"
 
 XORG_PN = "libX11"
 
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1"
+ 
+
 EXTRA_OECONF += "--without-xcb"
 
 do_compile() {
-        (
-                unset CC LD CXX CCLD
-                oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
-        )
-        oe_runmake
+        (
+         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+         # mv to stop it getting rebuilt
+         mv makekeys.c makekeys.c.orig
+         cd ../../
+        ) || exit 1
+        oe_runmake
 }
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"