packages/xorg-lib/libx11 : Fix makekeys generation on all libx11 bb packages

diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index f6b2774..7ac5b58 100644 (file)
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -1,6 +1,6 @@
 require xorg-lib-common.inc
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 DESCRIPTION = "Base X libs."
 
@@ -19,9 +19,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*"
 
 do_compile() {
-       (
-        unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-        cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-       ) || exit 1
-       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
+         cd ../../
+        ) || exit 1
+        oe_runmake
 }
+

diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index ecd4b54..422afc9 100644 (file)
--- a/packages/xorg-lib/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
@@ -5,7 +5,7 @@ SECTION = "x11/libs"
 LICENSE = "XFree86"
 DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
 PROVIDES = "virtual/libx11"
-PR = "r2"
+PR = "r3"
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
@@ -17,14 +17,17 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF="--enable-malloc0returnsnull"
 
+
 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
+         cd ../../
+        ) || exit 1
+        oe_runmake
 }
 
+
 do_stage() {
        autotools_stage_all
 }