[oe-commits] org.oe.dev packages/xorg-lib/libx11 : Fix makekeys generation on all libx11 bb packages

[ifaistos commit]

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

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 20003f50e0d46dc38d79ec48490dec98c0cbaf3e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=20003f50e0d46dc38d79ec48490dec98c0cbaf3e
Files:
1
packages/xorg-lib/libx11_1.1.1.bb
packages/xorg-lib/libx11_git.bb
Diffs:

#
# mt diff -r23b06e81646850c6f787954ba3849d84517a2d68 -r20003f50e0d46dc38d79ec48490dec98c0cbaf3e
#
# 
# 
# patch "packages/xorg-lib/libx11_1.1.1.bb"
#  from [64b162c41d94d420ca2ae8a3be7094713d85eef6]
#    to [2a23c0349e30662b6bb5e1e9ecb7863558ebd333]
# 
# patch "packages/xorg-lib/libx11_git.bb"
#  from [5e1bd26b4b39732e4df307470aa71637735457d7]
#    to [3a8f855aa7d38479c22b0a10a3dee5bf7c744bc3]
# 
============================================================
--- packages/xorg-lib/libx11_1.1.1.bb	64b162c41d94d420ca2ae8a3be7094713d85eef6
+++ packages/xorg-lib/libx11_1.1.1.bb	2a23c0349e30662b6bb5e1e9ecb7863558ebd333
@@ -1,6 +1,6 @@ PE = "1"
 require xorg-lib-common.inc
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 DESCRIPTION = "Base X libs."
 
@@ -19,9 +19,11 @@ do_compile() {
 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
 }
+
============================================================
--- packages/xorg-lib/libx11_git.bb	5e1bd26b4b39732e4df307470aa71637735457d7
+++ packages/xorg-lib/libx11_git.bb	3a8f855aa7d38479c22b0a10a3dee5bf7c744bc3
@@ -5,7 +5,7 @@ PROVIDES = "virtual/libx11"
 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 @@ EXTRA_OECONF="--enable-malloc0returnsnul
 
 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
 }