[uClibc-cvs] svn commit: trunk/buildroot/package/xorg

andersen at uclibc.org andersen at uclibc.org
Wed Jul 13 07:36:41 UTC 2005


Author: andersen
Date: 2005-07-13 01:36:40 -0600 (Wed, 13 Jul 2005)
New Revision: 10818

Log:
Fix some stupid bugs in the Xorg build


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	2005-07-13 05:43:11 UTC (rev 10817)
+++ trunk/buildroot/package/xorg/xorg-config.patch	2005-07-13 07:36:40 UTC (rev 10818)
@@ -73,7 +73,7 @@
  #undef PostIncDir
 -#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
 -#define CcCmd /skiff/local/bin/arm-linux-gcc
-+#define PostIncDir REPLACE_STAGING_DIR/lib/gcc-lib/REPLACE_ARCH-linux-uclibc/3.3.3/include
++#define PostIncDir REPLACE_GCCINC_DIR
 +#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc
  #undef CplusplusCmd
 -#define HasCplusplus YES

Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk	2005-07-13 05:43:11 UTC (rev 10817)
+++ trunk/buildroot/package/xorg/xorg.mk	2005-07-13 07:36:40 UTC (rev 10818)
@@ -42,11 +42,15 @@
 $(XORG_DIR)/.configure: $(DL_DIR)/$(XORG_SOURCE)
 	$(XORG_CAT) $(DL_DIR)/$(XORG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(XORG_DIR) package/xorg/ xorg\*.patch
+	$(SED) 's:REPLACE_GCCINC_DIR:$(shell $(TARGET_CROSS)gcc -print-file-name=include):g' $(XORG_CF)
 	$(SED) 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' $(XORG_CF)
 	$(SED) 's:REPLACE_ARCH:$(ARCH):g' $(XORG_CF)
 	$(SED) 's:#define CcCmd.*:#define CcCmd $(TARGET_CROSS)gcc:g' $(XORG_CF)
 	$(SED) 's:#define RanlibCmd.*:#define RanlibCmd $(TARGET_CROSS)ranlib:g' $(XORG_CF)
 	$(SED) 's:#define LdCmd.*:#define LdCmd $(TARGET_CROSS)ld:g' $(XORG_CF)
+	$(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
 	touch $(XORG_DIR)/.configure
 
 $(XORG_XSERVER): $(XORG_DIR)/.configure




More information about the uClibc-cvs mailing list