[oe-commits] org.oe.dev xorg-lib: resolving bugs #1411, #1412

[MartinDietze commit]

xorg-lib: resolving bugs #1411, #1412
* The () block containing the compile command for the native makekeys tool now has a "|| exit 1" so that the build stops if the compile fails
* The X11_CFLAGS and XT_CFLAGS respectively are set empty when compiling the native tool

Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: 5734e6f735b9a9b347d13c6e31473aed54ec52f6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5734e6f735b9a9b347d13c6e31473aed54ec52f6
Files:
1
packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
Diffs:

#
# mt diff -r67163c625b15951f2b396aedcd5ff10c5d106b2b -r5734e6f735b9a9b347d13c6e31473aed54ec52f6
#
# 
# 
# patch "packages/xorg-lib/libx11_X11R7.0-1.0.0.bb"
#  from [e359c468f97184043a53b5b64226727633000638]
#    to [924df23cd97858fbc04e933045d701dcf867b1e6]
# 
# patch "packages/xorg-lib/libx11_X11R7.1-1.0.1.bb"
#  from [0a5e917cfebce3f8fb792d19b4d8eb91e41bd86d]
#    to [886183213de13f1ddc730f9951b3667647cc66c0]
# 
# patch "packages/xorg-lib/libxt_X11R7.0-1.0.0.bb"
#  from [f6b569020b73b1c591b6fde12dda76ee7fe62a0a]
#    to [fdda8448f1002e71f2b9a7110f16dc4dcf42424b]
# 
# patch "packages/xorg-lib/libxt_X11R7.1-1.0.2.bb"
#  from [5e2ac78a0445c02b006ef0e9306d4f43ff807c91]
#    to [fdda8448f1002e71f2b9a7110f16dc4dcf42424b]
# 
============================================================
--- packages/xorg-lib/libx11_X11R7.0-1.0.0.bb	e359c468f97184043a53b5b64226727633000638
+++ packages/xorg-lib/libx11_X11R7.0-1.0.0.bb	924df23cd97858fbc04e933045d701dcf867b1e6
@@ -15,8 +15,8 @@ do_compile() {
 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 -C src/util 'X11_CFLAGS=' '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
+	) || exit 1
 	rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
============================================================
--- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	0a5e917cfebce3f8fb792d19b4d8eb91e41bd86d
+++ packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	886183213de13f1ddc730f9951b3667647cc66c0
@@ -17,15 +17,6 @@ do_compile() {
 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
-	)
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
-	oe_runmake
-}
-
-do_compile_nylon() {
-	(
-		unset CC LD CXX CCLD
 		oe_runmake -C src/util 'X11_CFLAGS=' '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
 	) || exit 1
 	rm -f ${STAGING_INCDIR}/X11/Xlib.h
============================================================
--- packages/xorg-lib/libxt_X11R7.0-1.0.0.bb	f6b569020b73b1c591b6fde12dda76ee7fe62a0a
+++ packages/xorg-lib/libxt_X11R7.0-1.0.0.bb	fdda8448f1002e71f2b9a7110f16dc4dcf42424b
@@ -13,7 +13,7 @@ do_compile() {
 do_compile() {
 	(
 		unset CC LD CXX CCLD
-		oe_runmake -C 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}' makestrs
-	)
+		oe_runmake -C util 'XT_CFLAGS=' '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}' makestrs
+	) || exit 1
 	oe_runmake
 }
============================================================
--- packages/xorg-lib/libxt_X11R7.1-1.0.2.bb	5e2ac78a0445c02b006ef0e9306d4f43ff807c91
+++ packages/xorg-lib/libxt_X11R7.1-1.0.2.bb	fdda8448f1002e71f2b9a7110f16dc4dcf42424b
@@ -13,14 +13,6 @@ do_compile() {
 do_compile() {
 	(
 		unset CC LD CXX CCLD
-		oe_runmake -C 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}' makestrs
-	)
-	oe_runmake
-}
-
-do_compile_nylon() {
-	(
-		unset CC LD CXX CCLD
 		oe_runmake -C util 'XT_CFLAGS=' '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}' makestrs
 	) || exit 1
 	oe_runmake