Merge branch 'develop' into t/15605/__1___2_3__evaluates_to_1

Author: rwst

.dir-locals.el

@@ -0,0 +1,9 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((nil
+  ;; Use space instead of tabs for indentation
+  (indent-tabs-mode . nil))
+ (makefile-mode
+  ;; But use tabs in Makefiles
+  (indent-tabs-mode . t)))

VERSION.txt

@@ -1 +1 @@
-SageMath version 7.5.beta5, Release Date: 2016-12-01
+SageMath version 7.5.beta6, Release Date: 2016-12-09

build/make/deps

@@ -1,4 +1,4 @@
-###############################################################################
+## -*- Makefile -*- ###########################################################
 # This file ($SAGE_ROOT/build/make/deps) will be copied into
 # $SAGE_ROOT/build/make/Makefile by $SAGE_ROOT/build/make/install
 ###############################################################################

build/pkgs/autotools/SPKG.txt

@@ -61,5 +61,5 @@ spkg. If you edit this, you must update Makefile.build using the
 spkg-write-makefile script. After optionally updating the git repos
 using spkg-src, you need to run
   ./spkg-write-makefile >Makefile.build
-This must be run in a Sage shell, with the the autotools spkg
+This must be run in a Sage shell, with the autotools spkg
 installed.

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=3029fd9073df3ef509b6bfcdd444eb8e64fd8e43
-md5=56bbebf050b6e795969f78c0cbf34c60
-cksum=1121692794
+sha1=bc57761b576cc4747e7014697424a8237f870921
+md5=e50f6aad2bca8d7602fc9d3d522bb69e
+cksum=4245048724

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-194
+195

build/pkgs/giac/spkg-install

@@ -39,7 +39,14 @@ echo "Configuring giac..."
 #    --disable-ao     (avoid libao deps)
 #    --disable-lapack (avoid lapack and blas deps because they could be from the base system)
 
-./configure --prefix="$SAGE_LOCAL" --disable-gui --disable-ao --disable-lapack
+#   On OS X (10.12) the built in intl is broken
+DISABLENLS=""
+if [ "$UNAME" = "Darwin" ]; then
+    echo "OS X Building without Native Language Support"
+    DISABLENLS="--disable-nls"
+fi
+
+./configure --prefix="$SAGE_LOCAL" --disable-gui --disable-ao --disable-lapack "$DISABLENLS"
 
 if [ $? -ne 0 ]; then
     exit 1

build/pkgs/giac/type

@@ -1 +1 @@
-optional
+standard

build/pkgs/numpy/lapack_conf.py

@@ -15,15 +15,15 @@
     conf_file.write('[blas]\n')
     inc_dir = pc_blas['include_dirs']
     if len(inc_dir) > 0 :
-        conf_file.write('include_dirs = '+ ':'.join(list(inc_dir))+'\n')
+        conf_file.write('include_dirs = '+ ':'.join(inc_dir)+'\n')
     lib_dir = pc_blas['library_dirs']
     if len(lib_dir) > 0 :
-        conf_file.write('library_dirs = '+ ':'.join(list(lib_dir))+'\n')
-    conf_file.write('blas_libs    = '+', '.join(list(pc_blas['libraries']))+'\n')
+        conf_file.write('library_dirs = '+ ':'.join(lib_dir)+'\n')
+    conf_file.write('blas_libs    = '+', '.join(pc_blas['libraries'])+'\n')
     conf_file.write('[lapack]\n')
     lib_dir = pc_lapack['library_dirs']
     if len(lib_dir) > 0 :
-        conf_file.write('library_dirs = '+ ':'.join(list(lib_dir))+'\n')
-    conf_file.write('lapack_libs  = '+', '.join(list(pc_lapack['libraries']))+'\n')
+        conf_file.write('library_dirs = '+ ':'.join(lib_dir)+'\n')
+    conf_file.write('lapack_libs  = '+', '.join(pc_lapack['libraries'])+'\n')
 
 conf_file.close()

build/pkgs/numpy/package-version.txt

@@ -1 +1 @@
-1.11.1
+1.11.1.p0