From: jacmet at uclibc.org <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/xorg
Date: Tue, 26 Sep 2006 05:48:44 -0700 (PDT) [thread overview]
Message-ID: <20060926124844.66F424869E@busybox.net> (raw)
Author: jacmet
Date: 2006-09-26 05:48:43 -0700 (Tue, 26 Sep 2006)
New Revision: 16225
Log:
Proper !i386 cross compilation support
Modified:
trunk/buildroot/package/xorg/xorg-config.patch
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/xorg-config.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-config.patch 2006-09-26 10:07:41 UTC (rev 16224)
+++ trunk/buildroot/package/xorg/xorg-config.patch 2006-09-26 12:48:43 UTC (rev 16225)
@@ -47,7 +47,7 @@
+#define XInputDrivers mouse keyboard
--- xc/config/cf/cross.def~ Thu May 12 15:28:01 MDT 2005
+++ xc/config/cf/cross.def Thu May 12 15:28:01 MDT 2005
-@@ -1,45 +1,45 @@
+@@ -1,45 +1,63 @@
-/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
+/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */
/*
@@ -57,10 +57,27 @@
* given your local configuration.
*/
-#if 0
--#undef i386Architecture
-+#define i386Architecture
++/* Undefine any architectures detected */
+ #undef i386Architecture
-#define Arm32Architecture
++#undef AMD64Architecture
++#undef PpcArchitecture
++#undef SparcArchitecture
++#undef AlphaArchitecture
+#undef Arm32Architecture
++#undef ia64Architecture
++#undef MipsArchitecture
++
++/* Cross compiling for: */
++#define REPLACE_XORG_ARCHArchitecture
++
++/* MTRR detection in linux.cf is exec'ed before cross.def, so redo it here */
++#undef HasMTRRSupport
++#if defined (i386Architecture) || defined (AMD64Architecture)
++# define HasMTRRSupport YES
++#else
++# define HasMTRRSupport NO /* no for non-ix86 */
++#endif
#undef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O2
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2006-09-26 10:07:41 UTC (rev 16224)
+++ trunk/buildroot/package/xorg/xorg.mk 2006-09-26 12:48:43 UTC (rev 16225)
@@ -48,6 +48,27 @@
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 @@
$(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
next reply other threads:[~2006-09-26 12:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-26 12:48 jacmet at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-03-06 18:37 [Buildroot] svn commit: trunk/buildroot/package/xorg ninevoltz at uclibc.org
2007-08-15 9:46 ulf at uclibc.org
2007-05-22 11:17 jacmet at uclibc.org
2007-01-25 20:34 andersen at uclibc.org
2007-01-15 22:33 andersen at uclibc.org
2007-01-11 10:38 andersen at uclibc.org
2007-01-11 6:17 andersen at uclibc.org
2007-01-10 23:56 andersen at uclibc.org
2006-11-17 23:17 andersen at uclibc.org
2006-10-14 11:34 jacmet at uclibc.org
2006-10-02 18:25 andersen at uclibc.org
2006-09-27 18:17 jacmet at uclibc.org
2006-07-20 20:29 andersen
2006-07-20 15:46 andersen
2006-07-18 2:00 andersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060926124844.66F424869E@busybox.net \
--to=jacmet@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox