From dd510c2b699dbe5cc3b6440b6e12505fe214e6bc Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 26 Sep 2006 12:48:43 +0000
Subject: Proper !i386 cross compilation support

---
 package/xorg/xorg.mk | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'package/xorg/xorg.mk')

diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index eeb911a8b..15a590796 100644
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -48,6 +48,27 @@ else
 HAS_FREETYPE2=NO
 endif
 
+# figure out Xorg's idea of corresponding architecture name
+ifeq ($(BR2_alpha),y)
+XARCH=Alpha
+else ifeq ($(BR2_arm),y)
+XARCH=Arm32
+else ifeq ($(BR2_armeb),y)
+XARCH=Arm32
+else ifeq ($(BR2_i386),y)
+XARCH=i386A
+else ifeq ($(BR2_mips),y)
+XARCH=Mips
+else ifeq ($(BR2_mipsel),y)
+XARCH=Mips
+else ifeq ($(BR2_powerpc),y)
+XARCH=Ppc
+else ifeq ($(BR2_sparc),y)
+XARCH=Sparc
+else ifeq ($(BR2_x86_64),y)
+XARCH=AMD64
+endif
+
 $(DL_DIR)/$(XORG_SOURCE):
 	$(WGET) -P $(DL_DIR) $(XORG_SITE)/$(XORG_SOURCE)
 
@@ -65,6 +86,7 @@ $(XORG_DIR)/.configured: $(DL_DIR)/$(XORG_SOURCE)
 	$(SED) 's:#.*define.*HasPam.*YES::g' $(XORG_DIR)/config/cf/linux.cf
 	$(SED) 's:#.*define.*CrossCompiling.*NO:#define CrossCompiling YES:g' $(XORG_DIR)/config/cf/Imake.tmpl
 	$(SED) 's:#.*undef.*CrossCompileDir.*:#define CrossCompileDir$(STAGING_DIR)/bin:g' $(XORG_DIR)/config/cf/Imake.tmpl
+	$(SED) 's:REPLACE_XORG_ARCH:$(XARCH):g' $(XORG_DIR)/config/cf/cross.def
 	touch $(XORG_DIR)/.configured
 
 $(XORG_XSERVER): $(XORG_DIR)/.configured
-- 
cgit v1.2.3