[oe-commits] org.oe.dev libx11 1.1.2|1.1.3 repair (merge with poky broke it)

[mickeyl commit]

libx11 1.1.2|1.1.3 repair (merge with poky broke it)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 52e9acbec8d097ee6c40062fb00fe21d0a0d8ad5
ViewMTN: http://monotone.openembedded.org/revision/info/52e9acbec8d097ee6c40062fb00fe21d0a0d8ad5
Files:
1
packages/xorg-lib/libx11_1.1.2.bb
packages/xorg-lib/libx11_1.1.3.bb
Diffs:

#
# mt diff -r704fa90da4fa5a97729e223bda8f29dbb343546d -r52e9acbec8d097ee6c40062fb00fe21d0a0d8ad5
#
# 
# 
# patch "packages/xorg-lib/libx11_1.1.2.bb"
#  from [21405491fb1f9d79342a43068804f81e6413482f]
#    to [f16ef325f409288bc24e586320ae2628150e2905]
# 
# patch "packages/xorg-lib/libx11_1.1.3.bb"
#  from [21405491fb1f9d79342a43068804f81e6413482f]
#    to [f16ef325f409288bc24e586320ae2628150e2905]
# 
============================================================
--- packages/xorg-lib/libx11_1.1.2.bb	21405491fb1f9d79342a43068804f81e6413482f
+++ packages/xorg-lib/libx11_1.1.2.bb	f16ef325f409288bc24e586320ae2628150e2905
@@ -17,8 +17,6 @@ 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
-		# mv to stop it getting rebuilt
-		mv makekeys.c makekeys.c.orig
 		cd ../../
 	) || exit 1
 	oe_runmake
============================================================
--- packages/xorg-lib/libx11_1.1.3.bb	21405491fb1f9d79342a43068804f81e6413482f
+++ packages/xorg-lib/libx11_1.1.3.bb	f16ef325f409288bc24e586320ae2628150e2905
@@ -17,8 +17,6 @@ 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
-		# mv to stop it getting rebuilt
-		mv makekeys.c makekeys.c.orig
 		cd ../../
 	) || exit 1
 	oe_runmake