From 43caf4f119d0afcd4e25a71487b1b6d2ef71ede0 Mon Sep 17 00:00:00 2001
From: Martin Dietze <di@fh-wedel.de>
Date: Thu, 14 Sep 2006 09:52:15 +0000
Subject: xorg-lib: added nylon-specific solutions to bugs #1411, #1412 (can
 well be made common by maintainers)

---
 packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 9 +++++++++
 packages/xorg-lib/libxt_X11R7.1-1.0.2.bb  | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 2f4a5706d5..99ba5d8016 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -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
+}
diff --git a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
index b8bbe4dea3..0644eadc7e 100644
--- a/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
@@ -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
+}
-- 
cgit v1.2.3