Ticket #8951: clear-ECL-from-tmp.patch

SPKG.txt

@@ -45 +45 @@
 
 == Changelog ==
 
-=== ecl-10.4.1 (William Stein, 28 April 2010) ===
+=== ecl-10.4.1 (William Stein & David Kirkby, 14th May 2010) ===
   * Upgrade to latest stable upstream release.
+  * Remove /tmp/ECL* on Solaris. 
+  * Forces 64-bit if SAGE64 is set to 'yes' and not 'yes' or '1', 
+    as previous version. 
+  * No longer prints "Building a 32-bit version" if SAGE64 is not set to 
+    'yes' since some systems build 64-bit by default. 
 
 === ecl-10.2.1 (William Stein, 14 February 2010) ===
   * Upgrade to latest stable upstream release.

spkg-install

@@ -22 +22 @@
 CPPFLAGS="$CPPFLAGS -I$SAGE_LOCAL/include"
 LDFLAGS="$LDFLAGS -L$SAGE_LOCAL/lib"
 
-# Compile for 64-bit if SAGE64 is set to 'yes' or '1'
-if [ "x$SAGE64" = "xyes" ] || [ "x$SAGE64" = "x1" ]  ; then
+# Compile for 64-bit if SAGE64 is set to 'yes' 
+if [ "x$SAGE64" = "xyes" ]  ; then
    echo "Building a 64-bit version of ECL"
    CFLAGS="$CFLAGS -m64 "
    CXXFLAGS="$CXXFLAGS -m64 "
@@ -32 +32 @@
    # Some packages may need LDFLAGS and/or ABI set here. 
    LDFLAGS="$LDFLAGS -m64 "
    ABI=64
-else
-   echo "Building a 32-bit version of ECL"
 fi
 
 # If SAGE_DEBUG is set either unset (the default), or set to  'yes'
@@ -170 +168 @@
    exit 1
 fi
 
+# The following is a TEMPORARY hack, needed to ensure ECL has a higher
+# probability of building on Solaris. There's a bug in ECL which means it
+# makes an assumption about temporary files which is not correct (neither
+# by POSIX standards or Solaris). This stops a build some times if 
+# multiple people use a Solaris machine as temporary files created by one user
+# can't be removed by another. 
+
+if [ "x$UNAME" = xSunOs ] ; then
+  rm -f /tmp/ECL*
+fi
+
 # Remove old install of ecl, if any.
 rm -rf "$SAGE_LOCAL/lib/ecl-"*
 if [ $? -ne 0 ]; then