From 009df92b965656fa1454dc8e90f0fd1848f7442a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 13 Dec 2010 19:07:23 +0100
Subject: fix cross-compile on Darwin

---
 package/xinit/Makefile                 |  3 ++-
 package/xinit/patches/patch-startx_cpp | 24 ++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'package/xinit')

diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index 7cd77646e..0497fa287 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xinit
 PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		7ad82221ebd6600a8d33712ec3b62efb
 PKG_DESCR:=		X Window System initializer
 PKG_SECTION:=		x11/apps
@@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,XINIT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS:=	--without-launchd
+XAKE_FLAGS+=		RAWCPP="$(TARGET_CROSS)cpp"
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_XINIT)/usr/bin
diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp
index 911346c59..cf47ce9b4 100644
--- a/package/xinit/patches/patch-startx_cpp
+++ b/package/xinit/patches/patch-startx_cpp
@@ -1,6 +1,26 @@
 --- xinit-1.2.1.orig/startx.cpp	2010-03-15 23:35:56.000000000 +0100
-+++ xinit-1.2.1/startx.cpp	2010-07-15 21:25:44.458413180 +0200
-@@ -347,5 +347,8 @@ screenrestore
++++ xinit-1.2.1/startx.cpp	2010-12-13 17:44:35.000000000 +0100
+@@ -242,18 +242,7 @@ if [ x"$enable_xauth" = x1 ] ; then
+     removelist=
+ 
+     XCOMM set up default Xauth info for this machine
+-    case `uname` in
+-    Linux*)
+-        if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
+-            hostname=`hostname -f`
+-        else
+-            hostname=`hostname`
+-        fi
+-        ;;
+-    *)
+-        hostname=`hostname`
+-        ;;
+-    esac
++    hostname=`hostname`
+ 
+     authdisplay=${display:-:0}
+ #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
+@@ -347,5 +336,8 @@ screenrestore
  kbd_mode -a
  #endif
  
-- 
cgit v1.2.3