From 8b0ced0f936f7f19732c187f37f6050d8c08c7e8 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Fri, 21 Dec 2012 02:16:22 +0000
Subject: glew fixes for clang and for hurd


diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index ce633cf..6b7d0d1 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -213,14 +213,28 @@ build_glew()
   cd glew-$version
   mkdir -p $DEPLOYDIR/lib/pkgconfig
 
+  # Glew makefiles are not built for Linux Multiarch. We aren't trying
+  # to fix everything here, just the test machines OScad normally runs on
+
   # Fedora 64-bit
-  if [ -e /usr/lib64 ]; then
-    if [ "`ls /usr/lib64 | grep Xmu`" ]; then
-      echo "modifying glew makefile for 64 bit machine"
+  if [ "`uname -m | grep 64`" ]; then
+    if [ -e /usr/lib64/libXmu.so.6 ]; then
       sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ config/Makefile.linux
     fi
   fi
 
+  # debian hurd i386
+  if [ "`uname -m | grep 386`" ]; then
+    if [ -e /usr/lib/i386-gnu/libXi.so.6 ]; then
+      sed -ibak s/"-lXi"/"\-L\/usr\/lib\/i386-gnu\/libXi.so.6"/ config/Makefile.gnu
+    fi
+  fi
+
+  # clang linux
+  if [ $CC ]; then
+    sed -ibak s/"CC = cc"/"CC = $(CC)"/ config/Makefile.linux
+  fi
+
   MAKER=make
   if [ "`uname | grep BSD`" ]; then
     if [ "`command -v gmake`" ]; then
@@ -231,8 +245,8 @@ build_glew()
     fi
   fi
 
-  GLEW_DEST=$DEPLOYDIR CC=$CC $MAKER -j$NUMCPU
-  GLEW_DEST=$DEPLOYDIR CC=$CC $MAKER install
+  GLEW_DEST=$DEPLOYDIR $MAKER -j$NUMCPU
+  GLEW_DEST=$DEPLOYDIR $MAKER install
 }
 
 build_opencsg()
-- 
cgit v0.10.1