[oe-commits] org.oe.dev xorg-lib: added nylon-specific solutions to bugs #1411, #1412 (can well be made common by maintainers)

[MartinDietze commit]

xorg-lib: added nylon-specific solutions to bugs #1411, #1412 (can well be made common by maintainers)

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

#
# mt diff -r48ef04347217f482864106eff428115a91d608d0 -r619a276e86caa46c11d197b6180abeac14a49c5d
#
# 
# 
# patch "packages/xorg-lib/libx11_X11R7.1-1.0.1.bb"
#  from [5f76f4ac21bb7bb7f590bd1ab9dc5099edbea83b]
#    to [0a5e917cfebce3f8fb792d19b4d8eb91e41bd86d]
# 
# patch "packages/xorg-lib/libxt_X11R7.1-1.0.2.bb"
#  from [f6b569020b73b1c591b6fde12dda76ee7fe62a0a]
#    to [5e2ac78a0445c02b006ef0e9306d4f43ff807c91]
# 
============================================================
--- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	5f76f4ac21bb7bb7f590bd1ab9dc5099edbea83b
+++ packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	0a5e917cfebce3f8fb792d19b4d8eb91e41bd86d
@@ -22,3 +22,12 @@ do_compile() {
 	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
+	oe_runmake
+}
============================================================
--- packages/xorg-lib/libxt_X11R7.1-1.0.2.bb	f6b569020b73b1c591b6fde12dda76ee7fe62a0a
+++ packages/xorg-lib/libxt_X11R7.1-1.0.2.bb	5e2ac78a0445c02b006ef0e9306d4f43ff807c91
@@ -17,3 +17,11 @@ do_compile() {
 	)
 	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
+}