[oe-commits] org.oe.dev merge of '611bfe4d6e620cea4d216e318144b7394bd7d322'

[koen commit]

merge of '611bfe4d6e620cea4d216e318144b7394bd7d322'
     and '75c7809d53aac42fe9ec7942504b4d2b1a89081d'

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

#
# mt diff -r611bfe4d6e620cea4d216e318144b7394bd7d322 -r23b06e81646850c6f787954ba3849d84517a2d68
#
# 
# 
# patch "packages/xorg-lib/libx11_1.1.1.bb"
#  from [d6ef52550aee66eb87bf539fabce336d695675b4]
#    to [64b162c41d94d420ca2ae8a3be7094713d85eef6]
# 
# patch "packages/xorg-lib/libx11_git.bb"
#  from [6f70a3457ce2494b5cda8c52da648c489858f463]
#    to [5e1bd26b4b39732e4df307470aa71637735457d7]
# 
============================================================
--- packages/xorg-lib/libx11_1.1.1.bb	d6ef52550aee66eb87bf539fabce336d695675b4
+++ packages/xorg-lib/libx11_1.1.1.bb	64b162c41d94d420ca2ae8a3be7094713d85eef6
@@ -1,13 +1,12 @@ PE = "1"
 require xorg-lib-common.inc
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 DESCRIPTION = "Base X libs."
 
 DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
 	libxcb libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
 
 XORG_PN = "libX11"
 
============================================================
--- packages/xorg-lib/libx11_git.bb	6f70a3457ce2494b5cda8c52da648c489858f463
+++ packages/xorg-lib/libx11_git.bb	5e1bd26b4b39732e4df307470aa71637735457d7
@@ -5,8 +5,7 @@ PROVIDES = "virtual/libx11"
 LICENSE = "XFree86"
 DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
 PROVIDES = "virtual/libx11"
-RPROVIDES = "virtual/libx11"
-PR = "r1"
+PR = "r2"
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"


#
# mt diff -r75c7809d53aac42fe9ec7942504b4d2b1a89081d -r23b06e81646850c6f787954ba3849d84517a2d68
#
# 
# 
# patch "packages/xorg-lib/libx11_1.1.2.bb"
#  from [e93d3e6090cf94bb514343ddbf2cd6c114b7ef2b]
#    to [72fc7fde07ba2a58ea79355937eb2f6e1c0495be]
# 
============================================================
--- packages/xorg-lib/libx11_1.1.2.bb	e93d3e6090cf94bb514343ddbf2cd6c114b7ef2b
+++ packages/xorg-lib/libx11_1.1.2.bb	72fc7fde07ba2a58ea79355937eb2f6e1c0495be
@@ -5,17 +5,19 @@ PE = "1"
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 PE = "1"
+PR = "r1"
 
 XORG_PN = "libX11"
 
 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
+         cd ../../
+        ) || exit 1
+        oe_runmake
 }
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"