[Lunar-commits] <moonbase> NVIDIA-beta: fix compilation for 64-bit

[Paul Bredbury]

commit afa232996c20fc865409938fa6f8c9b8bda54af5
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Tue Sep 22 01:53:14 2009 +0700

    NVIDIA-beta: fix compilation for 64-bit
    
    By removing the 32-bit compilations in Makefile.
    
    Also added a missing &&.
---
 x11/NVIDIA-beta/BUILD |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index 7a1b74a..e3e2693 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -22,6 +22,15 @@
   rm -f *Linux* &&
   sedit 's/Bstatic/Bdynamic/' Makefile &&
   sedit 's/Bstatic/Bdynamic/' public.mk &&
+
+  if [[ $(arch) == x86_64 ]] ; then
+    # Don't compile 32-bits on pure 64-bit Lunar
+    sedit 's/COMPAT_32_SRC *= */\0#/' Makefile &&
+    sedit 's/COMPAT_32_SRC *= */\0#/' public.mk &&
+    sedit 's/-DNV_X86_64//' Makefile &&
+    sedit 's/-DNV_X86_64//' public.mk
+  fi &&
+
   make clean &&
   make rebuild_tls_test &&
   make rebuild_tls_test_dso &&
@@ -114,7 +123,7 @@
   # Get a sane default if haven't set it yet
   if [ "x$LUNAR_GL" == "x" ] ; then
     set_local_config LUNAR_GL binary
-  fi
+  fi &&
 
   # This is a temp workaround for braindead dlopen calls inside the NVIDIA
   # libglx.so