summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Borassi <michele.borassi@imtlucca.it>2015-08-06 11:47:49 +0200
committerMichele Borassi <michele.borassi@imtlucca.it>2015-08-06 11:47:49 +0200
commit93dee5e3d8e20b2fd19da57644f0f67e645171de (patch)
tree6dc3e4afbe472697de0e007a9f31927c57fb1a04
parentSimplified handling of labels (diff)
parentUpdated Sage version to 6.9.beta1 (diff)
Merged with beta1
Conflicts: src/sage/graphs/digraph.py src/sage/graphs/generic_graph.py src/sage/graphs/graph.py
-rw-r--r--VERSION.txt2
-rw-r--r--build/pkgs/configure/checksums.ini6
-rw-r--r--build/pkgs/configure/package-version.txt2
-rw-r--r--build/pkgs/ecl/SPKG.txt2
-rw-r--r--build/pkgs/ecl/checksums.ini6
-rw-r--r--build/pkgs/ecl/package-version.txt2
-rw-r--r--build/pkgs/ecl/patches/gmp.patch34
-rw-r--r--build/pkgs/ecl/patches/implib.patch236
-rw-r--r--build/pkgs/ecl/patches/write_error.patch14
-rwxr-xr-xbuild/pkgs/ecl/spkg-install12
-rwxr-xr-xbuild/pkgs/ecl/spkg-src46
-rwxr-xr-xbuild/pkgs/gf2x/spkg-install4
-rw-r--r--build/pkgs/graphs/SPKG.txt16
-rw-r--r--build/pkgs/graphs/checksums.ini6
-rw-r--r--build/pkgs/graphs/package-version.txt2
-rw-r--r--build/pkgs/ipython/checksums.ini6
-rw-r--r--build/pkgs/ipython/package-version.txt2
-rw-r--r--build/pkgs/ncurses/patches/work_around_changed_output_of_GNU_cpp_5.x.patch6
-rw-r--r--src/bin/sage-banner2
-rwxr-xr-xsrc/bin/sage-list-packages2
-rw-r--r--src/bin/sage-version.sh4
-rwxr-xr-xsrc/doc/common/builder.py6
-rw-r--r--src/doc/en/reference/graphs/index.rst1
-rw-r--r--src/doc/en/reference/structure/index.rst2
-rw-r--r--src/module_list.py3
-rw-r--r--src/sage/calculus/calculus.py10
-rw-r--r--src/sage/calculus/wester.py3
-rw-r--r--src/sage/combinat/designs/bibd.py124
-rw-r--r--src/sage/combinat/designs/database.py320
-rw-r--r--src/sage/combinat/designs/difference_family.py2
-rw-r--r--src/sage/combinat/designs/incidence_structures.py1
-rw-r--r--src/sage/combinat/finite_state_machine.py336
-rw-r--r--src/sage/combinat/finite_state_machine_generators.py5
-rw-r--r--src/sage/functions/orthogonal_polys.py2
-rw-r--r--src/sage/functions/piecewise.py2
-rw-r--r--src/sage/geometry/polyhedron/base.py41
-rw-r--r--src/sage/geometry/polyhedron/library.py45
-rw-r--r--src/sage/graphs/base/boost_graph.pxd34
-rw-r--r--src/sage/graphs/base/boost_graph.pyx274
-rw-r--r--src/sage/graphs/base/boost_interface.cpp58
-rw-r--r--src/sage/graphs/base/c_graph.pyx14
-rw-r--r--src/sage/graphs/digraph.py11
-rw-r--r--src/sage/graphs/distances_all_pairs.pyx19
-rw-r--r--src/sage/graphs/generators/families.py3
-rw-r--r--src/sage/graphs/generators/random.py5
-rw-r--r--src/sage/graphs/generators/smallgraphs.py44
-rw-r--r--src/sage/graphs/generic_graph.py1801
-rw-r--r--src/sage/graphs/graph.py11
-rw-r--r--src/sage/graphs/graph_decompositions/bandwidth.pyx12
-rw-r--r--src/sage/graphs/graph_generators.py7
-rw-r--r--src/sage/graphs/graph_plot.py11
-rw-r--r--src/sage/graphs/spanning_tree.pyx21
-rw-r--r--src/sage/graphs/strongly_regular_db.pyx1252
-rw-r--r--src/sage/homology/chain_complex.py44
-rw-r--r--src/sage/homology/delta_complex.py2
-rw-r--r--src/sage/homology/examples.py12
-rw-r--r--src/sage/interfaces/chomp.py5
-rw-r--r--src/sage/libs/pari/pari_instance.pxd2
-rw-r--r--src/sage/libs/pari/pari_instance.pyx18
-rw-r--r--src/sage/matroids/utilities.py2
-rw-r--r--src/sage/misc/sagedoc.py29
-rw-r--r--src/sage/numerical/interactive_simplex_method.py363
-rw-r--r--src/sage/rings/fraction_field_element.pyx30
-rw-r--r--src/sage/rings/number_field/number_field_element.pyx2
-rw-r--r--src/sage/rings/polynomial/polynomial_element.pyx233
-rw-r--r--src/sage/rings/polynomial/polynomial_element_generic.py78
-rw-r--r--src/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx2
-rw-r--r--src/sage/rings/polynomial/polynomial_zz_pex.pyx2
-rw-r--r--src/sage/schemes/elliptic_curves/ell_rational_field.py3
-rw-r--r--src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py154
-rw-r--r--src/sage/structure/set_factories.py1180
-rw-r--r--src/sage/structure/set_factories_example.py527
-rw-r--r--src/sage/symbolic/expression.pyx57
-rw-r--r--src/sage/version.py4
74 files changed, 6529 insertions, 1112 deletions
diff --git a/VERSION.txt b/VERSION.txt
index c5de210..a93c3a4 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-Sage version 6.9.beta0, released 2015-07-29
+Sage version 6.9.beta1, released 2015-08-05
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
index e6e6098..bdf80f5 100644
--- a/build/pkgs/configure/checksums.ini
+++ b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
-sha1=74c12f15bd843d9bb723a17bac629846e4e8f57a
-md5=84df33fa9762cb8826ced5a7e6aadbc0
-cksum=4042526937
+sha1=8be9070797613265821e1660191e41fddff58d59
+md5=7ea664318dc0543591e39456676d208b
+cksum=1278202916
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
index fe4afb0..e34885b 100644
--- a/build/pkgs/configure/package-version.txt
+++ b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-106
+107
diff --git a/build/pkgs/ecl/SPKG.txt b/build/pkgs/ecl/SPKG.txt
index ab2ffe8..ee1f125 100644
--- a/build/pkgs/ecl/SPKG.txt
+++ b/build/pkgs/ecl/SPKG.txt
@@ -34,6 +34,8 @@ Website: http://ecls.sourceforge.net/
* boehm_gc
== Special Update/Build Instructions ==
+ * As autotools need to be run after most of the patches are applied,
+ we do all the patching in spkg-source.
* Deleting the following directories saves space: without doing
this, the tarball can grow from under 3 megabytes to more than 7
megabytes. Deleting these files is done automatically by the
diff --git a/build/pkgs/ecl/checksums.ini b/build/pkgs/ecl/checksums.ini
index f0e6ca9..7b0e8c9 100644
--- a/build/pkgs/ecl/checksums.ini
+++ b/build/pkgs/ecl/checksums.ini
@@ -1,4 +1,4 @@
tarball=ecl-VERSION.tar.bz2
-sha1=f9ee0699433be837e90d04f6f038acf9209cf5f6
-md5=db91e48a9f140bd0c571c9f82bc74eb2
-cksum=2161474303
+sha1=d5b9f2f19847697f3cbe54e69daf609d1ea1b9ca
+md5=ba1d8acd05b2921c556a488191ff4b6b
+cksum=1247067343
diff --git a/build/pkgs/ecl/package-version.txt b/build/pkgs/ecl/package-version.txt
index 34603f3..74a1062 100644
--- a/build/pkgs/ecl/package-version.txt
+++ b/build/pkgs/ecl/package-version.txt
@@ -1 +1 @@
-13.5.1.p0
+15.3.7p0
diff --git a/build/pkgs/ecl/patches/gmp.patch b/build/pkgs/ecl/patches/gmp.patch
index 9ac008a..50a5a79 100644
--- a/build/pkgs/ecl/patches/gmp.patch
+++ b/build/pkgs/ecl/patches/gmp.patch
@@ -1,33 +1,13 @@
-diff -druN src.orig/src/configure.in src/src/configure.in
---- src.orig/src/configure.in 2012-12-07 22:01:02.000000000 +0100
-+++ src/src/configure.in 2014-04-09 15:17:50.282780900 +0200
-@@ -11,7 +11,7 @@
- AC_INIT([ecl],[13.5.1],[])
+diff --git b/src/configure.ac a/src/configure.ac
+index bc8d84b..e076e09 100644
+--- b/src/configure.ac
++++ a/src/configure.ac
+@@ -11,7 +11,7 @@ dnl
+ AC_INIT([ecl],[15.3.7],[])
AC_REVISION([$Revision$])
AC_CONFIG_SRCDIR([bare.lsp.in])
-AC_CONFIG_AUX_DIR([gmp])
+AC_CONFIG_AUX_DIR([.])
- AC_PREREQ(2.59)
+ AC_PREREQ(2.69)
dnl -----------------------------------------------------------------------
-diff -druN src.orig/src/configure src/src/configure
---- src.orig/src/configure 2012-12-07 22:01:02.000000000 +0100
-+++ src/src/configure 2014-04-09 15:20:21.360905900 +0200
-@@ -2546,7 +2546,7 @@
-
-
- ac_aux_dir=
--for ac_dir in gmp "$srcdir"/gmp; do
-+for ac_dir in . "$srcdir"/.; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
-@@ -2562,7 +2562,7 @@
- fi
- done
- if test -z "$ac_aux_dir"; then
-- as_fn_error $? "cannot find install-sh, install.sh, or shtool in gmp \"$srcdir\"/gmp" "$LINENO" 5
-+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5
- fi
-
- # These three variables are undocumented and unsupported,
diff --git a/build/pkgs/ecl/patches/implib.patch b/build/pkgs/ecl/patches/implib.patch
index 818f537..ab11e18 100644
--- a/build/pkgs/ecl/patches/implib.patch
+++ b/build/pkgs/ecl/patches/implib.patch
@@ -1,71 +1,8 @@
-diff -durN src.orig/src/configure.in src/src/configure.in
---- src.orig/src/configure.in 2012-12-17 11:08:10.000000000 +0100
-+++ src/src/configure.in 2013-01-18 11:34:30.012132746 +0100
-@@ -582,6 +582,19 @@
- AC_SUBST(SONAME)
- AC_SUBST(SONAME_LDFLAGS)
-
-+dnl ----------------------------------------------------------------------
-+dnl IMPLIB_NAME is only active when IMPLIB_NAME is non nil
-+dnl
-+AC_MSG_CHECKING(for import name)
-+if test "${enable_soname}" != yes; then
-+ IMPLIB_NAME=''
-+ AC_MSG_RESULT([none])
-+else
-+ AC_MSG_RESULT([${IMPLIB_NAME}])
-+fi
-+AC_SUBST(IMPLIB_NAME)
-+AC_SUBST(IMPLIB_LDFLAGS)
-+
- dnl Related to that, the package version number
- ECL_VERSION_NUMBER=$(($PACKAGE_MAJOR * 10000 + $PACKAGE_MINOR * 100 + $PACKAGE_LEAST))
- AC_SUBST(ECL_VERSION_NUMBER)
-diff -durN src.orig/src/Makefile.in src/src/Makefile.in
---- src.orig/src/Makefile.in 2012-12-17 11:08:06.000000000 +0100
-+++ src/src/Makefile.in 2013-01-18 11:34:30.012132746 +0100
-@@ -174,10 +174,14 @@
- if test -s $$i ; then \
- if echo $$i | grep dll; then \
- $(INSTALL_LIBRARY) $$i $(DESTDIR)$(bindir); \
-- fi; \
-- $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
-+ else \
-+ $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
-+ fi \
- fi \
- done
-+ if [ "x@IMPLIB_NAME@" != "x" -a -f "@IMPLIB_NAME@" ]; then \
-+ $(INSTALL_LIBRARY) @IMPLIB_NAME@ $(DESTDIR)$(libdir); \
-+ fi
- if [ "x@SONAME@" != "x" -a -f "@SONAME@" ]; then \
- ( cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME3@ @SONAME2@ @SONAME1@ && \
- mv @SONAME@ @SONAME3@ && \
-diff -durN src.orig/src/compile.lsp.in src/src/compile.lsp.in
---- src.orig/src/compile.lsp.in 2012-12-17 11:08:05.000000000 +0100
-+++ src/src/compile.lsp.in 2013-01-18 11:34:30.012132746 +0100
-@@ -58,7 +58,7 @@
- ;;;
- ;;; * Add include path to not yet installed headers, and remove include flag
- ;;; (-I) to installed directory, and Notice that we must explicitely mention
--;;; libecl.so/ecl.dll instead of using -lecl. This is to avoid interference
-+;;; libecl.so/cygecl.dll instead of using -lecl. This is to avoid interference
- ;;; with an already installed copy of ECL.
- ;;;
- (setq c::*cc-flags*
-@@ -140,7 +140,7 @@
- ;;;
- ;;; We do not need the -rpath flag for the library, nor -lecl.
- ;;;
--(let* ((c::*ld-shared-flags* #-msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@"
-+(let* ((c::*ld-shared-flags* #-msvc " @IMPLIB_LDFLAGS@ @SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@"
- #+msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @STATICLIBS@ @CLIBS@")
- (c::*cc-flags* (concatenate 'string "-DECL_API -I@true_builddir@/c " c::*cc-flags*))
- (extra-args nil))
-diff -durN src.orig/src/aclocal.m4 src/src/aclocal.m4
---- src.orig/src/aclocal.m4 2012-12-17 11:08:05.000000000 +0100
-+++ src/src/aclocal.m4 2013-01-18 11:34:30.012132746 +0100
-@@ -232,6 +232,8 @@
+diff --git a/src/aclocal.m4 b/src/aclocal.m4
+index 63d8997..79ff24d 100644
+--- a/src/aclocal.m4
++++ b/src/aclocal.m4
+@@ -233,6 +233,8 @@ AC_SUBST(LIBPREFIX)dnl Name components of a statically linked library
AC_SUBST(LIBEXT)
AC_SUBST(SHAREDEXT)dnl Name components of a dynamically linked library
AC_SUBST(SHAREDPREFIX)
@@ -74,7 +11,7 @@ diff -durN src.orig/src/aclocal.m4 src/src/aclocal.m4
AC_SUBST(OBJEXT)dnl These are set by autoconf
AC_SUBST(EXEEXT)
AC_SUBST(INSTALL_TARGET)dnl Which type of installation: flat directory or unix like.
-@@ -241,6 +243,8 @@
+@@ -242,6 +244,8 @@ ECL_GC_DIR=gc-unstable
ECL_LDRPATH=''
SHAREDEXT='so'
SHAREDPREFIX='lib'
@@ -83,7 +20,7 @@ diff -durN src.orig/src/aclocal.m4 src/src/aclocal.m4
LIBPREFIX='lib'
LIBEXT='a'
PICFLAG='-fPIC'
-@@ -252,6 +256,8 @@
+@@ -253,6 +257,8 @@ THREAD_OBJ="$THREAD_OBJ threads/process threads/queue threads/mutex threads/cond
clibs=''
SONAME=''
SONAME_LDFLAGS=''
@@ -92,7 +29,7 @@ diff -durN src.orig/src/aclocal.m4 src/src/aclocal.m4
case "${host_os}" in
# libdir may have a dollar expression inside
linux*)
-@@ -354,10 +360,14 @@
+@@ -355,10 +361,14 @@ case "${host_os}" in
shared='yes'
THREAD_CFLAGS='-D_THREAD_SAFE'
THREAD_LIBS='-lpthread'
@@ -108,9 +45,9 @@ diff -durN src.orig/src/aclocal.m4 src/src/aclocal.m4
+ IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
+ IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
PICFLAG=''
- ;;
- mingw*)
-@@ -367,10 +377,14 @@
+ if test "x$host_cpu" = "xx86_64" ; then
+ # Our GMP library is too old and does not support
+@@ -373,10 +383,14 @@ case "${host_os}" in
enable_threads='yes'
THREAD_CFLAGS='-D_THREAD_SAFE'
THREAD_GC_FLAGS='--enable-threads=win32'
@@ -127,102 +64,71 @@ diff -durN src.orig/src/aclocal.m4 src/src/aclocal.m4
PICFLAG=''
INSTALL_TARGET='flatinstall'
TCPLIBS='-lws2_32'
-diff -durN src.orig/src/configure src/src/configure
---- src.orig/src/configure 2012-12-17 11:08:11.000000000 +0100
-+++ src/src/configure 2013-01-18 11:35:15.231702758 +0100
-@@ -643,6 +643,8 @@
- CL_FIXNUM_TYPE
- XMKMF
- ECL_VERSION_NUMBER
-+IMPLIB_LDFLAGS
-+IMPLIB_NAME
- SONAME_LDFLAGS
- SONAME
- SONAME1
-@@ -659,6 +661,8 @@
- ECL_GC_DIR
- thehost
- INSTALL_TARGET
-+IMPLIB_PREFIX
-+IMPLIB_EXT
- SHAREDPREFIX
- SHAREDEXT
- LIBEXT
-@@ -4855,10 +4859,13 @@
-
-
-
-+
- ECL_GC_DIR=gc-unstable
- ECL_LDRPATH=''
- SHAREDEXT='so'
- SHAREDPREFIX='lib'
-+IMPLIB_EXT=''
-+IMPLIB_PREFIX=''
- LIBPREFIX='lib'
- LIBEXT='a'
- PICFLAG='-fPIC'
-@@ -4870,6 +4877,8 @@
- clibs=''
- SONAME=''
- SONAME_LDFLAGS=''
-+IMPLIB_NAME=''
-+IMPLIB_LDFLAGS=''
- case "${host_os}" in
- # libdir may have a dollar expression inside
- linux*)
-@@ -4972,10 +4981,14 @@
- shared='yes'
- THREAD_CFLAGS='-D_THREAD_SAFE'
- THREAD_LIBS='-lpthread'
-- SHARED_LDFLAGS="-shared ${LDFLAGS}"
-- BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
-- SHAREDPREFIX=''
-+ SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
-+ BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
-+ SHAREDPREFIX='cyg'
- SHAREDEXT='dll'
-+ IMPLIB_PREFIX='lib'
-+ IMPLIB_EXT='dll.a'
-+ IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
-+ IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
- PICFLAG=''
- ;;
- mingw*)
-@@ -4985,10 +4998,14 @@
- enable_threads='yes'
- THREAD_CFLAGS='-D_THREAD_SAFE'
- THREAD_GC_FLAGS='--enable-threads=win32'
-- SHARED_LDFLAGS=''
-- BUNDLE_LDFLAGS=''
-+ SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
-+ BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
- SHAREDPREFIX=''
- SHAREDEXT='dll'
-+ IMPLIB_PREFIX='lib'
-+ IMPLIB_EXT='dll.a'
-+ IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
-+ IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
- PICFLAG=''
- INSTALL_TARGET='flatinstall'
- TCPLIBS='-lws2_32'
-@@ -6131,6 +6148,19 @@
-
-
+diff --git a/src/compile.lsp.in b/src/compile.lsp.in
+index 773fe99..697c115 100755
+--- a/src/compile.lsp.in
++++ b/src/compile.lsp.in
+@@ -58,7 +58,7 @@
+ ;;;
+ ;;; * Add include path to not yet installed headers, and remove include flag
+ ;;; (-I) to installed directory, and Notice that we must explicitely mention
+-;;; libecl.so/ecl.dll instead of using -lecl. This is to avoid interference
++;;; libecl.so/cygecl.dll instead of using -lecl. This is to avoid interference
+ ;;; with an already installed copy of ECL.
+ ;;;
+ (setq c::*cc-flags*
+@@ -140,7 +140,7 @@
+ ;;;
+ ;;; We do not need the -rpath flag for the library, nor -lecl.
+ ;;;
+-(let* ((c::*ld-shared-flags* #-msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@"
++(let* ((c::*ld-shared-flags* #-msvc " @IMPLIB_LDFLAGS@ @SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@"
+ #+msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @STATICLIBS@ @CLIBS@")
+ (c::*cc-flags* (concatenate 'string "-DECL_API -I@true_builddir@/c " c::*cc-flags*))
+ (extra-args nil))
+diff --git a/src/configure.ac b/src/configure.ac
+index e076e09..15d307a 100644
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -588,6 +588,20 @@ AC_SUBST(SONAME1)
+ AC_SUBST(SONAME)
+ AC_SUBST(SONAME_LDFLAGS)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for import name" >&5
-+$as_echo_n "checking for import name... " >&6; }
++dnl ----------------------------------------------------------------------
++dnl IMPLIB_NAME is only active when IMPLIB_NAME is non nil
++dnl
++AC_MSG_CHECKING(for import name)
+if test "${enable_soname}" != yes; then
+ IMPLIB_NAME=''
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-+$as_echo "none" >&6; }
++ AC_MSG_RESULT([none])
+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${IMPLIB_NAME}" >&5
-+$as_echo "${IMPLIB_NAME}" >&6; }
++ AC_MSG_RESULT([${IMPLIB_NAME}])
+fi
++AC_SUBST(IMPLIB_NAME)
++AC_SUBST(IMPLIB_LDFLAGS)
+
+
-+
+ dnl Related to that, the package version number
ECL_VERSION_NUMBER=$(($PACKAGE_MAJOR * 10000 + $PACKAGE_MINOR * 100 + $PACKAGE_LEAST))
-
-
+ AC_SUBST(ECL_VERSION_NUMBER)
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 12e9f05..74bc216 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -174,10 +174,14 @@ install:
+ if test -s $$i ; then \
+ if echo $$i | grep dll; then \
+ $(INSTALL_LIBRARY) $$i $(DESTDIR)$(bindir); \
+- fi; \
+- $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
++ else \
++ $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
++ fi \
+ fi \
+ done
++ if [ "x@IMPLIB_NAME@" != "x" -a -f "@IMPLIB_NAME@" ]; then \
++ $(INSTALL_LIBRARY) @IMPLIB_NAME@ $(DESTDIR)$(libdir); \
++ fi
+ if [ "x@SONAME@" != "x" -a -f "@SONAME@" ]; then \
+ ( cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME3@ @SONAME2@ @SONAME1@ && \
+ mv @SONAME@ @SONAME3@ && \
diff --git a/build/pkgs/ecl/patches/write_error.patch b/build/pkgs/ecl/patches/write_error.patch
index 8ddcf68..658b864 100644
--- a/build/pkgs/ecl/patches/write_error.patch
+++ b/build/pkgs/ecl/patches/write_error.patch
@@ -1,13 +1,15 @@
-diff -ru src/src/c/file.d b/src/c/file.d
---- src/src/c/file.d 2012-12-07 22:01:02.000000000 +0100
-+++ b/src/c/file.d 2013-04-10 09:07:24.537513659 +0200
-@@ -3335,7 +3335,8 @@
+diff --git b/src/c/file.d a/src/c/file.d
+index de7ba7b..c1f8c1e 100755
+--- b/src/c/file.d
++++ a/src/c/file.d
+@@ -3341,7 +3341,9 @@ output_stream_write_byte8(cl_object strm, unsigned char *c, cl_index n)
ecl_disable_interrupts();
do {
out = fwrite(c, sizeof(char), n, IO_STREAM_FILE(strm));
- } while (out < n && restartable_io_error(strm, "fwrite"));
-+ /* Ignore write errors to stderr to avoid an infinite loop */
-+ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite"));
++ /* Ignore write errors to stderr to avoid an infinite loop */
++ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite"));
++
ecl_enable_interrupts();
return out;
}
diff --git a/build/pkgs/ecl/spkg-install b/build/pkgs/ecl/spkg-install
index b5056c3..f478c45 100755
--- a/build/pkgs/ecl/spkg-install
+++ b/build/pkgs/ecl/spkg-install
@@ -7,16 +7,6 @@ if [ -z "$SAGE_LOCAL" ] ; then
fi
cd src
-# For some of the patches, Cygwin also has upstream fixes that are
-# closely related, keep track. See Trac 11119, for example.
-for patch in ../patches/*.patch; do
- [ -f "$patch" ] || continue
- patch -p1 <"$patch"
- if [ $? -ne 0 ]; then
- echo >&2 "Error applying '$patch'"
- exit 1
- fi
-done
if [ -z "$CFLAG64" ] ; then
CFLAG64=-m64
@@ -60,6 +50,8 @@ echo "Using CPPFLAGS=$CPPFLAGS"
echo "Using LDFLAGS=$LDFLAGS"
echo "configure scripts and/or makefiles might override these later"
echo ""
+echo "Note that the patches were applied by spkg-source"
+echo ""
# export everything. Probably not necessary in most cases.
export CFLAGS
diff --git a/build/pkgs/ecl/spkg-src b/build/pkgs/ecl/spkg-src
index fe8a075..587331c 100755
--- a/build/pkgs/ecl/spkg-src
+++ b/build/pkgs/ecl/spkg-src
@@ -6,11 +6,15 @@
# and its subdirectories!
#
# HOW TO MAKE THE TARBALL:
-# 1) copy upstream ecl-$ECLVERSION.tgz to this directory
+# 1) copy upstream the tarball from gitlab; it will be named by the commit
+# hash, e.g. ecl-a014bd2c23a9ba863ecdd28c1c48d67de04d3620.tar.gz
+# Untar ECL tarball; the root dir will be named ecl.git/
# 2) ./spkg-src
-# 3) compress ecl-$ECLVERSION into a .tar.bz2 file
+#
+# needs autotools and sage in your PATH.
#
# AUTHOR: Jeroen Demeyer (November 2011)
+# Dima Pasechnik (July 2015)
# Sanity check: must be run from current directory
if ! [ -f spkg-src ]; then
@@ -21,12 +25,40 @@ fi
# Exit on failure
set -e
-# Untar ECL tarball
-ECLVERSION=13.5.1
-tar xf ecl-"$ECLVERSION".tgz
+# now we automate the task:
+ECLVERSION=`cat package-version.txt`
+ECLTARBALL=ecl-"$ECLVERSION".tar
+
+mv ecl.git ecl-"$ECLVERSION"
cd ecl-"$ECLVERSION"
+# the patches are applied here, as it has to be done before
+# running autoconf.
+cd src
+echo "applying patches in ecl-$ECLVERSION/src"
+# For some of the patches, Cygwin also has upstream fixes that are
+# closely related, keep track. See Trac 11119, for example.
+for patch in ../../patches/*.patch; do
+ patch --verbose -p2 <"$patch"
+ if [ $? -ne 0 ]; then
+ echo >&2 "Error applying '$patch'"
+ exit 1
+ fi
+done
+
+
+cd ..
# Remove unneeded files to save space
-rm -rf msvc
+rm -rf msvc/
cd src
-rm -rf gc-unstable gmp libffi
+rm -rf gc-unstable/ gmp/ libffi/
+libtoolize # to generate configure script
+autoreconf -ivf
+
+cd ../../
+rm -f "$ECLTARBALL".* "$ECLTARBALL"
+tar cf "$ECLTARBALL" ecl-"$ECLVERSION"/
+bzip2 "$ECLTARBALL"
+mv -f "$ECLTARBALL".bz2 ../../../upstream/
+sage -sh sage-fix-pkg-checksums
+rm -rf ecl-"$ECLVERSION"/
diff --git a/build/pkgs/gf2x/spkg-install b/build/pkgs/gf2x/spkg-install
index ee7e6a0..31798a5 100755
--- a/