summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Dietze <di@fh-wedel.de>2006-09-14 09:52:15 +0000
committerMartin Dietze <di@fh-wedel.de>2006-09-14 09:52:15 +0000
commit43caf4f119d0afcd4e25a71487b1b6d2ef71ede0 (patch)
treec268bcbd8f74419d92c52cd5d3f63ab8e283a029
parenta79589f43a9e6dab1bcd6de681435fe028e7d6bb (diff)
xorg-lib: added nylon-specific solutions to bugs #1411, #1412 (can well be made common by maintainers)
-rw-r--r--packages/xorg-lib/libx11_X11R7.1-1.0.1.bb9
-rw-r--r--packages/xorg-lib/libxt_X11R7.1-1.0.2.bb8
2 files changed, 17 insertions, 0 deletions
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
+}