XOrg-test

[Ranitha Mapatuna]

Crap forgot to attach the file..


On Tue, 2004-11-09 at 09:58 +1100, Ranitha Mapatuna wrote:
> Hey,
> 	I updated the BUILD file for XOrg-test. I have removed some of the
> #defines added to host.def as they were the same as the defaults. The
> only 'majoe' change is changing #define InstallFontconfigLibrary YES" to
> NO. I don't know why it was originally YES but it seems counter
> intuitive to have two versions of the fontconfig libraries floating
> around. It also caused compile errors for me with errors to the effect
> of cannot find /usr/X11R6/lib/libfontconfig.la. This can be 'fixed' by
> linking /usr/lib/libfontconfig.la to /usr/X11R6/lib/libfontconfig.la but
> they will diverge in version numbers sooner or later and might cause
> problems.
> 
> 	I also suggest, if this change is made, that once you install
> XOrg-test, you visit your /usr/lib dir and find out if any .la files
> refer to the version of fontconfig that used to be installed
> in /usr/X11R6/lib
> 
> for lib in `grep -lr "/usr/X11R6/lib/libfontconfig.la" *.la`; do 
> 	lvu from $lib | cut -d '-' -f1; 
> done
> 
> SHOULD work when done in /usr/lib. re lining those modules should get
> rid of the incorrect path for fc
> 
> Regards,
> 	Ranitha
> 
> _______________________________________________
> Lunar mailing list
> Lunar at lunar-linux.org
> http://lunar-linux.org/mailman/listinfo/lunar
-------------- next part --------------
(

  install_drm()  {
    DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
    DRI_DIR="extras/drm/linux"
    DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/drm"
    mkdir -p $DRM_DEST
    cd $DRM_DIR && make
    cd $SOURCE_DIRECTORY 
    cd $DRI_DIR && make
    cp $DRI_DIR/*.o $DRM_DEST 2>/dev/null
    depmod -a
    true
  }

  if [ -e /etc/X11/xinit/xinitrc ]; then
    cp /etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc.orig
    echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
  fi

  message "Building XOrg takes a very long time."

  bad_flags '-funroll-loops' '-ffast-math'

  echo  "#define InstallXdmConfig YES"          >> config/cf/host.def &&
  echo  "#define InstallXinitConfig YES"        >> config/cf/host.def &&

  echo  "#define DefaultCCOptions      $CFLAGS" >> config/cf/host.def &&
  echo  "#define LibraryCDebugFlags    $CFLAGS" >> config/cf/host.def &&
  echo  "#define DefaultCDebugFlags    $CFLAGS" >> config/cf/host.def &&
  echo  "#define OptimizedCDebugFlags  $CFLAGS" >> config/cf/host.def &&
  echo  "#define XVendorString \"Lunar-Linux.org (The X.Org Foundation $VERSION)\"" >> config/cf/host.def &&
  echo  "#define FontDir /usr/share/fonts"      >> config/cf/host.def &&
  echo  "#define HasZlib YES"			>> config/cf/host.def &&
  echo  "#define HasFreetype2 YES"              >> config/cf/host.def &&
  echo  "#define HasExpat  YES"			>> config/cf/host.def &&
  echo  "#define HasLibpng YES"			>> config/cf/host.def &&
  echo  "#define HasLibxml2 YES"		>> config/cf/host.def &&
  echo  "#define InstallFontconfigLibrary NO"  	>> config/cf/host.def &&
  echo  "#define HasSharedLibraries YES"	>> config/cf/host.def &&
  echo  "#define PreferXdmcpIPv6 YES"		>> config/cf/host.def &&

  if grep -q "Compilation aborted" /usr/include/linux/config.h ; then
    # This must happen or it will cause the module to break
    # claiming "Kernel only header included in userspace"
    devoke_installwatch &&
    cp -rL /usr/src/linux/include/linux/{autoconf.h,config.h} /usr/include/linux &&
    invoke_installwatch
  fi
  
  make World                            &&
  prepare_install                       &&
  cd $SOURCE_DIRECTORY                  &&
  make install                          &&
  make  install.man                     &&
  install_drm                           &&
  mkdir -p /usr/X11R6/include/GL        &&
  rm     -f  /usr/X11R6/lib/libz.a      &&
  rm     -f /usr/X11R6/include/zlib.h   &&
  rm     -f /usr/X11R6/include/zconf.h  &&
  rm     -f /usr/X11R6/lib/libz.a       &&

  if  [  !  -e                      /etc/skel/.xsession  ];  then
    cp  $SCRIPT_DIRECTORY/xsession  /etc/skel/.xsession
  fi  &&

  if  [  !  -e                    /usr/bin/X11  ];  then
    ln      -sf   /usr/X11R6/bin  /usr/bin/X11
  fi  &&

  if  [  !  -e          /usr/X11  ];  then
    ln      -sf  X11R6  /usr/X11
  fi  &&

  if  [  !  -e                         /usr/include/X11  ];  then
    ln      -sf  ../X11R6/include/X11  /usr/include/X11
  fi  &&

  if  [  !  -e                     /usr/lib/X11  ];  then
    ln      -sf  ../X11R6/lib/X11  /usr/lib/X11
  fi  &&

  if  [  !  -e                     /usr/lib/libMesaGLU.so ];  then
    ln      -sf  /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
  fi  &&

  if  [  !  -e                /usr/X11R6/lib/libMesaGL.so ];  then
    ln      -sf  /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
  fi

) > $C_FIFO 2>&1