Author: justin
Date: 2005-12-10 09:15:51 -0700 (Sat, 10 Dec 2005)
New Revision: 1269

Added:
   branches/6.1.1-newmake/packages/Xorg/991_ubuntu_gcc_flags.diff
Modified:
   branches/6.1.1-newmake/packages/Xorg/Makefile
Log:
[6.1.1-newmake] Added patch for Xorg to fix a segfault problem with ati/radeon.

Added: branches/6.1.1-newmake/packages/Xorg/991_ubuntu_gcc_flags.diff
===================================================================
--- branches/6.1.1-newmake/packages/Xorg/991_ubuntu_gcc_flags.diff      
2005-12-10 07:34:05 UTC (rev 1268)
+++ branches/6.1.1-newmake/packages/Xorg/991_ubuntu_gcc_flags.diff      
2005-12-10 16:15:51 UTC (rev 1269)
@@ -0,0 +1,14 @@
+$Id: 991_ubuntu_gcc_flags.diff 479 2005-08-02 20:08:46Z branden $
+
+diff -ruN xc-old/programs/Xserver/fb/Imakefile xc/programs/Xserver/fb/Imakefile
+--- xc-old/programs/Xserver/fb/Imakefile       2005-02-17 00:34:48.000000000 
+0000
++++ xc/programs/Xserver/fb/Imakefile   2005-05-17 17:35:58.060789960 +0000
+@@ -5,7 +5,7 @@
+ 
+ #if defined(i386Architecture) && defined(HasGcc34) && HasGcc34
+ MMXOPTIONS= -mmmx -Winline --param inline-unit-growth=10000 \
+-      --param large-function-growth=10000 -DUSE_GCC34_MMX
++      --param large-function-growth=10000
+ 
+ SpecialCObjectRule(fbmmx,fbmmx.c,$(MMXOPTIONS))
+ SpecialCObjectRule(fbpict,fbpict.c,$(MMXOPTIONS))

Modified: branches/6.1.1-newmake/packages/Xorg/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/Xorg/Makefile       2005-12-10 07:34:05 UTC 
(rev 1268)
+++ branches/6.1.1-newmake/packages/Xorg/Makefile       2005-12-10 16:15:51 UTC 
(rev 1269)
@@ -20,6 +20,8 @@
 URL-$(PATCH3)= $(HTTPBLFS)/$(NM)/$(PATCH3)
 SHA-$(PATCH3)= 32d4664d0d32955accfdf7079567180785836292
 
+PATCH4= 991_ubuntu_gcc_flags.diff
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -35,6 +37,7 @@
        patch -Np1 -i ../$(PATCH1)
        patch -Np1 -i ../$(PATCH2)
        patch -Np1 -i ../$(PATCH3)
+       patch -Np1 -i ../$(PATCH4)
        sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile
        pushd config/util ; \
        make -f Makefile.ini lndir ; \

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to