Bug 4809

Summary: xf8_32wid and cfb24 only need to be built on sparc
Product: xorg Reporter: Adam Jackson <ajax>
Component: Server/GeneralAssignee: Alan Coopersmith <alan.coopersmith>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: high    
Version: 6.99.99.901 (7.0 RC1)   
Hardware: PowerPC   
OS: Mac OS X (All)   
Whiteboard:
i915 platform: i915 features:
Bug Depends on:    
Bug Blocks: 1690    
Attachments:
Description Flags
Proposed fix for modular tree
ajax: 6.9/7.0+
Update patch to only disable building module but still allowing header install ajax: 6.9/7.0+

Description Adam Jackson 2005-10-18 22:09:02 UTC
the cfb24 module is only ever referenced from the xf8_32wid module, which is in
turn only ever referenced from the sunffb driver.  sunffb can not possibly work
on any other platform besides sparc, so neither module needs to be built on
non-sparc platforms.
Comment 1 Alan Coopersmith 2005-11-05 11:11:50 UTC
The monolith Imake is already set to only build xf8_32wid on SPARC via the
XF8_32Wid settings in xorg.conf.    Changing the monolith to build cfb24 only
when XF8_32Wid is true should be a simple matter of this change to 
xc/programs/Xserver/imakefile:

+#if defined(SparcArchitecture) || defined(Sparc64Architecture)
 CFB24SUBDIR = cfb24
+#endif

I'll try that on my SPARC & x86 builds on Solaris, and if it does the right
thing, I'll check it in.

That leaves the modular builds...
Comment 2 Alan Coopersmith 2005-11-26 10:55:51 UTC
Created attachment 3908 [details] [review]
Proposed fix for modular tree

This seems to work on Solaris at least - haven't tried on other platforms
Comment 3 Adam Jackson 2005-11-30 16:08:12 UTC
Comment on attachment 3908 [details] [review]
Proposed fix for modular tree

looks fine to me.
Comment 4 Alan Coopersmith 2005-12-04 03:46:02 UTC
Okay, I'll take care of this then.
Comment 5 Alan Coopersmith 2005-12-04 04:06:31 UTC
Checked in for RC3:
CVSROOT:	/cvs/xorg
Module name:	xserver
Changes by:	alanc@gabe.freedesktop.org	05/12/03 09:04:45

Log message:
  2005-12-03  Alan Coopersmith  <alan.coopersmith@sun.com>
  
  	* xorg/Makefile.am:
  	* xorg/configure.ac:
  	* xorg/hw/xfree86/Makefile.am:
  	* hw/xfree86/dixmods/Makefile.am:
  	Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809>
  	Patch #3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908>
  	xf8_32wid and cfb24 only need to be built on sparc

Modified files:
      xserver/xorg/:
        ChangeLog Makefile.am configure.ac 
      xserver/xorg/hw/xfree86/:
        Makefile.am 
      xserver/xorg/hw/xfree86/dixmods/:
        Makefile.am 
  
  Revision      Changes    Path
  1.135         +10 -0     xserver/xorg/ChangeLog
  http://cvs.freedesktop.org/xorg/xserver/xorg/ChangeLog
  1.14          +3 -0      xserver/xorg/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/Makefile.am
  1.139         +4 -1      xserver/xorg/configure.ac
  http://cvs.freedesktop.org/xorg/xserver/xorg/configure.ac
  1.34          +5 -2      xserver/xorg/hw/xfree86/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/hw/xfree86/Makefile.am
  1.21          +6 -1      xserver/xorg/hw/xfree86/dixmods/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/hw/xfree86/dixmods/Makefile.am


Comment 6 Alan Coopersmith 2005-12-04 09:53:33 UTC
Had to temporarily disable for RC3 because it broke distcheck of sunffb driver
on non-SPARC platforms.
Comment 7 Alan Coopersmith 2005-12-07 03:00:38 UTC
Created attachment 4011 [details] [review]
Update patch to only disable building module but still allowing header install
Comment 8 Adam Jackson 2005-12-10 04:03:44 UTC
Comment on attachment 4011 [details] [review]
Update patch to only disable building module but still allowing header install

approved for 7, i'll check this in.
Comment 9 Adam Jackson 2005-12-10 05:26:59 UTC
applied, thanks

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.