# HG changeset patch
# User David Kirkby <david.kirkby@onetel.net>
# Date 1275265635 -3600
# Node ID ddaf03893942bdfe6305edbbd6772efe9cb45ebe
# Parent  e8eac19d18ce2fcf24381b540633e375da94b085
#8089 Disable assembly code with --with-dffi=no option to configure script on OpenSolaris

diff -r e8eac19d18ce -r ddaf03893942 SPKG.txt
--- a/SPKG.txt	Sun Feb 14 23:07:18 2010 -0800
+++ b/SPKG.txt	Mon May 31 01:27:15 2010 +0100
@@ -45,6 +45,10 @@
 
 == Changelog ==
 
+=== ecl-10.2.1.p0 (David Kirkby, 31st May 2010) ===
+  * #8089 Add the configure option '--with-dffi=no' on
+   OpenSolaris on the x86 processor. This disables assembly code.
+
 === ecl-10.2.1 (William Stein, 14 February 2010) ===
   * Upgrade to latest stable upstream release.
 
diff -r e8eac19d18ce -r ddaf03893942 spkg-install
--- a/spkg-install	Sun Feb 14 23:07:18 2010 -0800
+++ b/spkg-install	Mon May 31 01:27:15 2010 +0100
@@ -158,7 +158,18 @@
 
 cd src
 
-./configure --prefix=$SAGE_LOCAL 
+if [ "x`uname -rsm`" = "xSunOS 5.11 i86pc" ] && [ "x$SAGE64" = xyes ]  ; then
+   # Need to add --with-dffi=no to disable assembly code on OpenSolaris x64. 
+   # This may be needed for other variants of Solaris, but for now at least
+   # the option is only given if all the following are true
+   # 1) OpenSolaris (SunOS 5.11)
+   # 2) Intel or AMD CPU 
+   # 3) 64-bit build
+   ./configure --prefix=$SAGE_LOCAL --with-dffi=no
+else
+   ./configure --prefix=$SAGE_LOCAL 
+fi
+
 if [ $? -ne 0 ]; then
    echo "Failed to configure ECL ... exiting"
    exit 1