[Lunar-commits] CVS: moonbase/x11/XOrg BUILD, 1.3, 1.4 CONFIGURE, 1.6, 1.7

[Auke Kok]

Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory dbguin.lunar-linux.org:/tmp/cvs-serv1549

Modified Files:
	BUILD CONFIGURE 
Log Message:
Cosmetics and semantics:
* the CFLAGS are now stripped before they are put in the host.def file
* this CFLAGS are now added in the BUILD on-the-fly so recompiling them with different optimizations does make a difference (and you don't have to reconfigure)
* reshuffled so that PAM options really *DO* get applied
I sooo want to rewrite the menus that they remember the user settings now...


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	29 Jun 2004 08:54:50 -0000	1.3
+++ BUILD	9 Jul 2004 08:26:51 -0000	1.4
@@ -2,10 +2,10 @@
 
   install_drm()  {
     DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
-    DRM_DEST="/lib/modules/`uname -r`/kernel/drivers"
-    mkdir   -p                $DRM_DEST
-    cp          $DRM_DIR/*.o  $DRM_DEST  2>/dev/null
-    depmod  -a
+    DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers"
+    mkdir -p $DRM_DEST
+    cp $DRM_DIR/*.o $DRM_DEST 2>/dev/null
+    depmod -a
     true
   }
 
@@ -14,8 +14,7 @@
     echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
   fi
 
-  message  "Building XOrg takes a very long time."
-
+  message "Building XOrg takes a very long time."
 
   echo  "#define  InstallXdmConfig    YES"  >>  config/cf/site.def
   echo  "#define  InstallXinitConfig  YES"  >>  config/cf/site.def
@@ -27,27 +26,36 @@
   export CPPFLAGS=`echo $CPPFLAGS | sed s/-funroll-loops//`
   export CPPFLAGS=`echo $CPPFLAGS | sed s/-ffast-math//`
 
-  if  module_installed  Linux-PAM
- 	 then  echo  "#define  HasPam  YES"  >>  config/cf/site.def
-  fi                                    &&
-
+  # first copy the stored settings over:
   cp $CONFIG_CACHE/host.def 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
+  # then add stuff on the fly:
+  if module_installed Linux-PAM ; then
+    echo "#define HasPam YES" >> config/cf/site.def
+  fi &&
+
+  echo  "#define DefaultCCOptions      $CFLAGS" >> config/cf/host.def &&
+  echo  "#define DefaultGcc2i386Opt    $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 &&
+	  
+
+  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 &&
+    devoke_installwatch &&
     cp -rL /usr/src/linux/include/linux/{autoconf.h,config.h} /usr/include/linux &&
-		invoke_installwatch
-	fi
+    invoke_installwatch
+  fi
 
   make World                            &&
   prepare_install                       &&
   cd $SOURCE_DIRECTORY                  &&
-  make  install                         &&
+  make install                          &&
   make  install.man                     &&
-        install_drm                     &&
-  mkdir  -p  /usr/X11R6/include/GL      &&
+  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  &&
@@ -81,5 +89,4 @@
     ln      -sf  /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
   fi
 
-
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/CONFIGURE,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CONFIGURE	14 May 2004 14:14:58 -0000	1.6
+++ CONFIGURE	9 Jul 2004 08:26:51 -0000	1.7
@@ -148,11 +148,6 @@
 
 generate_host_def()  {
 
-  echo  "#define DefaultCCOptions      $CFLAGS"
-  echo  "#define DefaultGcc2i386Opt    $CFLAGS"
-  echo  "#define LibraryCDebugFlags    $CFLAGS"
-  echo  "#define DefaultCDebugFlags    $CFLAGS"
-  echo  "#define OptimizedCDebugFlags  $CFLAGS"
   echo  "#define HasZlib YES"
   echo  "#define HasFreetype2 YES"
   echo  "#define ForceNormalLib  YES"
@@ -187,7 +182,6 @@
   fi
 
 
-
   if  [  -z  "$XInputDrivers"  ];  then
     echo  "#define XInputDrivers mouse"
   else
@@ -197,7 +191,6 @@
   fi
 
 
-
   for  ITEM  in   $YES_FONT_OPTIONS;  do
     echo  "#define $ITEM  YES"
   done