[Lunar-commits] <moonbase> fglrx: Add a seperate 64bit BUILD file.

[Moritz Heiber]

commit 1932ee1d58a116402f6cad3f9dde8a6f65e032ea
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Thu Jun 5 23:24:09 2008 +0200

    fglrx: Add a seperate 64bit BUILD file.
    
    Get rid of the logic inside the BUILD file
    for 64bit installs. Its better this way.
    
    (Needs adjustments once we support multilib)
---
 x11/fglrx/BUILD        |   24 +++++--------
 x11/fglrx/BUILD.x86_64 |   93 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 15 deletions(-)

diff --git a/x11/fglrx/BUILD b/x11/fglrx/BUILD
index 6c718e1..2cd5116 100644
--- a/x11/fglrx/BUILD
+++ b/x11/fglrx/BUILD
@@ -1,12 +1,6 @@
 (
   FGLRX_DIRECTORY="$SOURCE_DIRECTORY/fglrx-install"
 
-  unset BIT BITA BT
-
-  if [ -d /usr/lib64 ]; then
-    BIT="_64" BITA="_64a" BT="64"
-  fi &&
-
   sh $SOURCE --extract fglrx-install &&
   cd fglrx-install &&
 
@@ -27,7 +21,7 @@
   cd common/lib/modules/fglrx/build_mod/ &&
 
   # This symlink is needed for the kernel module to compile correctly
-  ln -s $FGLRX_DIRECTORY/arch/x86${BIT}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
+  ln -s $FGLRX_DIRECTORY/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
         $FGLRX_DIRECTORY/common/lib/modules/fglrx/build_mod &&
 
   sh make.sh &&
@@ -60,14 +54,14 @@
   cp -af common/usr/X11R6/include /usr/X11 &&
   install -m644 packages/Debian/dists/sid/amdcccle.desktop /usr/share/applications &&
 
-  cp -af arch/x86$BIT/usr/sbin /usr &&
+  cp -af arch/x86/usr/sbin /usr &&
 
-  install -m755 arch/x86$BIT/usr/X11R6/bin/* /usr/X11/bin/ &&
+  install -m755 arch/x86/usr/X11R6/bin/* /usr/X11/bin/ &&
 
   mkdir -p /usr/X11/lib/dri &&
 
-  cp -af arch/x86$BIT/usr/X11R6/lib$BT/lib* /usr/X11/lib$BT/xorg/ &&
-  cp -af arch/x86$BIT/usr/X11R6/lib$BT/modules/dri/fglrx_dri.so \
+  cp -af arch/x86/usr/X11R6/lib/lib* /usr/X11/lib/xorg/ &&
+  cp -af arch/x86/usr/X11R6/lib/modules/dri/fglrx_dri.so \
          /usr/X11/lib/dri &&
 
   # Setup symlinks
@@ -84,14 +78,14 @@
           /usr/X11/lib/xorg/${file}.so.1
   done &&
 
-  cp -af x710$BITA/usr/X11R6/lib$BT/modules /usr/X11/lib$BT/xorg/ &&
+  cp -af x710/usr/X11R6/lib/modules /usr/X11/lib/xorg/ &&
 
-  mkdir -p /usr/X11/lib$BT/modules/dri &&
-  ln -sf /usr/X11/lib/dri/fglrx_dri.so /usr/X11/lib$BT/modules/dri/ &&
+  mkdir -p /usr/X11/lib/modules/dri &&
+  ln -sf /usr/X11/lib/dri/fglrx_dri.so /usr/X11/lib/modules/dri/ &&
 
   mkdir -p /lib/modules/${KVER}/drivers/char/drm &&
   install -m644 common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko \
-          /lib/modules/${KVER}/drivers/char/drm/fglrx.ko &&
+          /lib/modules/${KVER}/drivers/char/drm/ &&
 
   #Update module dependencies
   depmod
diff --git a/x11/fglrx/BUILD.x86_64 b/x11/fglrx/BUILD.x86_64
new file mode 100644
index 0000000..aa6cb43
--- /dev/null
+++ b/x11/fglrx/BUILD.x86_64
@@ -0,0 +1,93 @@
+(
+  FGLRX_DIRECTORY="$SOURCE_DIRECTORY/fglrx-install"
+
+  sh $SOURCE --extract fglrx-install &&
+  cd fglrx-install &&
+
+  # We build the kernel BEFORE actually calling prepare install
+  # so it doesn't remove a working driver incase the kernel module
+  # fails to compile  
+
+  export KPATH="/usr/src/linux" &&
+
+  if [ -f $KPATH/include/linux/utsrelease.h ]; then
+    KVER=`grep UTS_RELEASE $KPATH/include/linux/utsrelease.h | cut -d'"' -f2`
+  else
+    KVER=`grep UTS_RELEASE $KPATH/include/linux/version.h | cut -d'"' -f2`
+  fi &&
+
+  export KPATH KVER &&
+
+  cd common/lib/modules/fglrx/build_mod/ &&
+
+  # This symlink is needed for the kernel module to compile correctly
+  ln -s $FGLRX_DIRECTORY/arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
+        $FGLRX_DIRECTORY/common/lib/modules/fglrx/build_mod &&
+
+  sh make.sh &&
+
+  cd $FGLRX_DIRECTORY &&
+
+  prepare_install &&
+
+  mkdir -p /etc/ati &&
+
+  # Install /etc files
+  for file in common/etc/ati/*; do
+    install -m0644 $file /etc/ati/
+  done &&
+
+  if [ ! -f /etc/ati/amdpcsdb ]; then
+    install -m666 /etc/ati/amdpcsdb.default /etc/ati/amdpcsdb
+  fi &&
+  
+  # Easy way out
+  cp -af common/usr/sbin /usr &&
+  cp -af common/usr/share/ati /usr/share &&
+  cp -af common/usr/share/doc /usr/share &&
+  cp -af common/usr/share/icons /usr/share &&
+  cp -af common/usr/share/man /usr/share &&
+  cp -af common/usr/include /usr &&
+
+  # X11R6 is deprecated
+  
+  cp -af common/usr/X11R6/include /usr/X11 &&
+  install -m644 packages/Debian/dists/sid/amdcccle.desktop /usr/share/applications &&
+
+  cp -af arch/x86_64/usr/sbin /usr &&
+
+  install -m755 arch/x86_64/usr/X11R6/bin/* /usr/X11/bin/ &&
+
+  mkdir -p /usr/X11/lib/dri &&
+
+  cp -af arch/x86_64/usr/X11R6/lib64/lib* /usr/X11/lib/xorg/ &&
+  cp -af arch/x86_64/usr/X11R6/lib64/modules/dri/fglrx_dri.so \
+         /usr/X11/lib/dri/ &&
+
+  # Setup symlinks
+  ln -sf /usr/X11/lib/xorg/libGL.so.1.2 \
+         /usr/X11/lib/libGL.so.1 &&
+
+  ln -sf /usr/X11/lib/xorg/libGL.so.1.2 \
+         /usr/X11/lib/libGL.so &&
+
+  unset file
+
+  for file in libfglrx_dm libfglrx_gamma libfglrx_pp libfglrx_tvout ; do
+    ln -s /usr/X11/lib/xorg/${file}.so.1.0 \
+          /usr/X11/lib/xorg/${file}.so.1
+  done &&
+
+  cp -af x710_64a/usr/X11R6/lib64/modules /usr/X11/lib/xorg/ &&
+
+  mkdir -p /usr/X11/lib/modules/dri &&
+  ln -sf /usr/X11/lib/dri/fglrx_dri.so /usr/X11/lib/modules/dri/ &&
+
+  mkdir -p /lib/modules/${KVER}/drivers/char/drm &&
+  install -m644 common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko \
+          /lib/modules/${KVER}/drivers/char/drm/fglrx.ko &&
+
+  #Update module dependencies
+  depmod
+
+) > $C_FIFO 2>&1