Merge branch 'develop' into ticket/16158-Spec_functor

Author: pjbruin

VERSION.txt

@@ -1 +1 @@
-Sage version 6.2.beta8, released 2014-04-14
+Sage version 6.2.rc0, released 2014-04-22

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=1bc0c5bed6782f0b4178509b5a2f71803e974660
-md5=edbfd3a7fe2451b2ea8aa926cd1bb249
-cksum=1897111074
+sha1=c630482460fbefb190ae5db5fd8be7b5b5155e14
+md5=65fcc5ce0faad306cdb84be455e12e9c
+cksum=1227008522

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-22
+23

build/pkgs/maxima/SPKG.txt

@@ -38,132 +38,6 @@ COPYING.
    disables the associated Makefiles, reducing the size of the SPKG
    greatly.
 
-== Changelog ==
-
-=== maxima-5.29.1.p3 (Jeroen Demeyer, 24 June 2013) ===
- * #14556: fix improper quoting in spkg-src script
- * Remove redirection of stdout/stderr on OS X (why was that needed?)
- * Redirect stdin from /dev/null to avoid interactive prompts during
-   install
-
-=== maxima-5.29.1.p2 (Julien Puydt, 11 May 2013) ===
- * #14556: don't create the maxima-noreadline script, which is now useless
-   (it dated back to when sage was using clisp instead of ecl)
-
-=== maxima-5.29.1.p1 (Jean-Pierre Flori, Dima Pasechnik, 29 December 2012) ===
- * #13364: update Maxima to version 5.29.1.
- * added the patch from Maxima bug tracker (bug 2520) to avoid
-   infinite recursion happening at integrate(abs(sin(x)),0,2*pi), leading
-   to a segfault
- * added the patch from  Maxima bug tracker (bug 2526) to fix
-   integrate(sqrt(x + sqrt(x)),x)
- * added the patch undoing the change
-   https://sf.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca
-   which caused extra '?' printed around some words (e.g. integer)
-   in Maxima dialogs. The issue this change addresses does not pop up for us.
- * rename spkg-dist to spkg-src
- * Remove comm.patch which has been integrated upstream.
-
-=== maxima-5.26.0.p1 (Dima Pasechnik, Dec 23rd 2012) ===
- * ASDF has changed in newer ECL, and so we need to reflect this in spkg-install
-   (it will now work with both old and new ASDF)
- * Removed pdf figures from the source, as we don't install them
- * removed `pwd` from check_error calls in spkg-install, as per #13364#comment:24
-
-=== maxima-5.26.0.p0 (Dima Pasechnik, February 28th 2012) ===
- * upgrading to version 5.26.0 to take care of #10682.
- * added patch/comm.patch to fix Maxima bug #3484414.
-   (false) precedes the display output if display2d is set to false.
-
-=== maxima-5.24.0.p0 (Michael Orlitzky, January 29th 2012) ===
- * Trac #12094: Version bump to prevent a regression with the
-   abs_integrate package.
- * Allow installation of local docs via SAGE_SPKG_INSTALL_DOCS.
- * Remove more unused documentation in spkg-dist.
- * Update SPKG.txt to clarify the need to run spkg-dist.
- * Fix a double negative in the spkg-install output.
-
-=== maxima-5.23.2.p3 (Simon King, December 10th, 2011) ===
- * #12131: Use --libdir, to make the package work on openSUSE.
-
-=== maxima-5.23.2.p2 (Leif Leonhardy, November 3rd 2011) ===
- * Trac #11966: Modification so that Sage will build on Lion.
-   Actually the new patch isn't specific to MacOS X 10.7 / Lion,
-   but necessary when building with the new ECL version from git
-   (ecl-11.1.2.git.20111030.spkg, see #11884).
- * Reviewer changes: Clean up `spkg-install`.
-
-=== maxima-5.23.2.p1 (William Stein, 31 October 2011) ===
- * Trac #11966: Modification so that Sage will build on Lion.
-
-=== maxima-5.23.2.p0 (Jeroen Demeyer, 18 May 2011) ===
- * Trac #11348: Add infodir.patch to use the correct "infodir" when
-   relocating the Sage install tree.
-
-=== maxima-5.23.2 (David Kirkby, 10th Feb 2011) ===
- * #10773 Update Maxima to the latest upstream release.
- * Starting with this version we need to touch all html and info files
-   in doc/info, otherwise they get regenerated which requires texinfo.
-
-=== maxima-5.22.1 (Nils Bruin, Volker Braun, 28 October 2010) ===
- * Update to the latest upstream version.
- * Rewrote section to build maxima.fas (ecl library) for new ASDF
-   (see Ticket #8645)
-
-=== maxima-5.20.1.p0 (William Stein, 3 April 2010) ===
- * Artificially bump version number to force rebuild, due to Maxima being broken
-   without doing so on upgrade.
-
-=== maxima-5.20.1 (Karl-Dieter Crisman, 21st December 2009) ===
- * Upgrade to the latest upstream release
- * Removed patches - the solver is now in Maxima, and topoly.lisp is no longer
-   used
- * Changed instructions below to not automatically assume spkg-dist, because
-   this calls automake and sometimes this causes build failures due to version
-   numbers (see Trac #7287)
-
-=== maxima-5.19.1.p2 (Mike Hansen, Nils Bruin,  December 2nd, 2009) ===
- * Added building Maxima as an ecl library to spkg-install
-
-=== maxima-5.19.1.p1 (Robert Marik, November 11th, 2009) ===
- * Added new CVS version for solve_rat_ineq.mac to close work on ticket #7325
-   (Sage cannot solve inequalities)
-
-=== maxima-5.19.1.p0 (Alex Ghitza, August 24th, 2009) ===
- * Added patch that works around bug in topoly.lisp by changing appropriate
-   instances of parg to carg
-
-=== maxima-5.19.1    (David Kirkby, 20th August 2009) ===
- * Upgrade to the latest upstream release
-
-=== maxima-5.16.3.p2 (Michael Abshoff, May 15th, 2009) ===
- * Switch lisp used to ecl
-
-=== maxima-5.16.3.p1 (Michael Abshoff, April 19th, 2009) ===
- * address review comment by Gonzalo
-
-=== maxima-5.16.3.p0 (Michael Abshoff, April 18th, 2009) ===
- * create maxima-noreadline script for matching dynamically readline disabling
-   clisp (#5662)
-
-=== maxima-5.16.3 (Michael Abshoff, September 27th, 2008) ===
- * Upgrade to upstream
-
-=== maxima-5.16.2.p0 (Michael Abshoff, September 16th, 2008) ===
- * Delete ~/.sage/maxima_commandlist_cache.sobj if it exists in spkg-install
-   (fixes #4133)
-
-=== maxima-5.16.2 (Michael Abshoff, August 21st, 2008) ===
- * Upgrade to upstream
-
-=== maxima-5.13.0.p2 (Michael Abshoff) ===
- * due to fixing #1471 we need to tell maxima to use clisp.bin as clisp
-   executable
-
-ToDo:
-
-Add history from hg
-
 =============================================================
 
 How to make a new version of the Maxima spkg.

build/pkgs/maxima/package-version.txt

@@ -1 +1 @@
-5.29.1.p4
+5.29.1.p5

build/pkgs/maxima/patches/build-fasl.patch

@@ -0,0 +1,23 @@
+Build a fasl library for ecl in addition to an executable program.
+
+References:
+* http://trac.sagemath.org/ticket/16178
+* https://github.com/cschwan/sage-on-gentoo/issues/226
+* https://bugs.gentoo.org/show_bug.cgi?id=499634
+
+Index: maxima-5.29.1/src/maxima.system
+===================================================================
+--- maxima-5.29.1.orig/src/maxima.system
++++ maxima-5.29.1/src/maxima.system
+@@ -75,6 +75,11 @@
+ 			     ;; Convert dir/foo.fas to dir/foo.o
+ 			     (make-pathname :type "o" :defaults p))
+ 			 files)))
++	(c::build-fasl "binary-ecl/maxima" :lisp-files obj
++			  :ld-flags
++			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
++							      (find-package "MAXIMA")))))
++			    (if (and x (not (string= x ""))) (list x))))
+ 	(c::build-program "binary-ecl/maxima" :lisp-files obj
+ 			  :ld-flags
+ 			  (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"

build/pkgs/maxima/spkg-install

@@ -82,36 +82,12 @@ if [[ -f "$DOT_SAGE/maxima_commandlist_cache.sobj" ]]; then
 fi
 
 
-# Build Maxima as a Lisp library
-# and install it into ECL's library directory:
-echo
-echo "Now building Maxima as an ECL library..."
-cd "$CUR"/src/src &&
-mkdir -p ./lisp-cache &&
-ecl \
-  -eval '(require `asdf)' \
-  -eval '(setf asdf::*user-cache* (truename "./lisp-cache"))' \
-  -eval '(load "maxima-build.lisp")' \
-  -eval '(asdf:make-build :maxima :type :fasl :move-here ".")' \
-  -eval '(quit)'
-check_error "Failed to build Maxima as an ECL library."
-
+# Install Maxima into ECL's library directory:
 ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
 echo
 echo "Now installing the Maxima library as '$ECLLIB/maxima.fas'..."
-PWD=`pwd`
-if [[ -f "maxima.system.fasb" ]]; then
-    echo "New ASDF encountered"
-    cp -f maxima.system.fasb "$ECLLIB/maxima.fas"
-    check_error "Failed to install '$PWD/maxima.system.fasb' as '$ECLLIB/maxima.fas'."
-elif [[ -f "maxima.fasb" ]]; then
-    echo "Old ASDF encountered"
-    cp -f maxima.fasb "$ECLLIB/maxima.fas"
-    check_error "Failed to install '$PWD/maxima.fasb' as '$ECLLIB/maxima.fas'."
-else
-    echo >&2 "Error: cannot find an .fasb file to install - exiting..."
-    exit 1
-fi
+cp -f "$CUR/src/src/binary-ecl/maxima.fas" "$ECLLIB/maxima.fas"
+check_error "Failed to install '$CUR/src/src/binary-ecl/maxima.fas' as '$ECLLIB/maxima.fas'."
 
 
 if [[ "$SAGE_SPKG_INSTALL_DOCS" = yes ]] ; then

build/pkgs/r/SPKG.txt

@@ -44,165 +44,6 @@ much code written for S runs unaltered under R.
    #9668.
  * libintl-visibility.patch: fix visibility of symbols for optional
    libintl library.
+ * large_address_aware.patch: don't pass --large-address-aware to ld on
+   Cygwin64.
 
-== Changelog ==
-
-=== r-3.0.2.p0 (Jean-Pierre Flori, 30 October 2013) ===
- * #14706: update to 3.0.2.
- * Remove sqrtl.patch which is now upstream.
- * Move old install of R on OS X.
- * Fix visibility of symbols for built-in libintl.
-
-=== r-3.0.1.p1 (Jean-Pierre Flori, 10 June 2013) ===
- * #14706: Use --disable-long-double on Cygwin rather than patching.
- * Add sqrtl.patch from upstream to make --disable-long-double work.
-
-=== r-3.0.1.p0 (Emmanuel Charpentier, 8 June 2013) ===
- * #14706: Drop-in replacement of upstream sources.
-
-=== r-2.15.2.p2 (John H. Palmieri, 17 March 2013) ===
- * #9668: fix hardcoding of paths in R by defining R_SHARE_DIR,
-   R_INCLUDE_DIR, and R_DOC_DIR relative to R_HOME_DIR, or rather, by
-   removing the portion of scripts/Makefile.in which hardcodes these
-   paths.
-
-=== r-2.15.2.p1 (Jean-Pierre Flori, 7 February 2013) ===
- * #14078: do not use logl on Cygwin.
-
-=== r-2.15.2.p0 (Emmanuel Charpentier, 25 January 2013) ===
- * "monkey see-monkey do" upgrade to current upstream
- * simple drop of curent source in src
- * removed patches/install_parallel.patch : patch complained
-   about a "reversed (or previously applied) patch detected!".
- * re-enables installation of upstream source packages
-   (ticket #14008).
-
-=== r-2.14.0.p6 (Jeroen Demeyer, 10 September 2012) ===
- * #13443: some clean up of spkg-install.
- * Compile R with optimization (at -O2 level).
- * No longer pass -I and -L options to gcc (see #13348).
- * No longer use sage_fortran (see #13349).
- * Re-enable parallel make install, which works now (see #13428).
-
-=== r-2.14.0.p5 (Jeroen Demeyer, 4 September 2012) ===
- * #9906: separate the rpy2 spkg.
-
-=== r-2.14.0.p4 (Jeroen Demeyer, 4 September 2012) ===
- * #13428: add patch install_parallel.patch
-
-=== r-2.14.0.p3 (Jeroen Demeyer, 30 March 2012) ===
- * #12787: use -### instead of -v to detect linker options
- * Don't export OSXFW in spkg-install
- * Remove "export MAKE=make" and "export MAKEFLAGS=".  Instead, install
-   with -j1.
- * Removed the fix_hardcode Python script, found simpler work-around
-   using environment variable SAGE_BUILDING_R set in spkg-install.
- * Use `patch` for patching.
-
-=== r-2.14.0.p2 (John H. Palmieri, 17 Dec 2011) ===
- * #12172: unconditionally disable X11 support on Darwin
-
-=== r-2.14.0.p1 (Simon King, 10 Dec 2011) ===
- * #12131: use --libdir, to make the package work on openSUSE
-
-=== r-2.14.0.p0 (Volker Braun, 19th November 2011) ===
- * #12057: upgrade to new upstream version
-
-=== r-2.10.1.p4 (Leif Leonhardy, September 25th 2010) ===
- * #10016: Don't call "sage -f" on the included Rpy spkg, instead call
-   "sage-spkg -f" directly, since only this is guaranteed to be present.
-   This is just a temporary solution, until the Rpy spkg is removed
-   from this one.
-
-=== r-2.10.1.p3 (Mariah Lenox, 30 Jun 2010) ===
- * added "--with-ICU=no" to configure line of spkg-install (#9396)
-
-=== r-2.10.1.p2 (Mitesh Patel, June 8th 2010) ===
- * #9186: Set an empty MAKEFLAGS variable before "make install".  On
-   OS X, at least, this fixes building multiple spkgs in parallel (cf.
-   #8306).
-
-=== r-2.10.1.p1 (Karl-Dieter Crisman, April 12th 2010) ===
- * Re-enable Aqua support on OSX
-
-=== r-2.10.1.p0 (David Kirkby, February 16th 2010) ===
- * Several items all covered by #8285
- * Added the undocumented option "--without-ICU" on Solaris,
-   as that allows R to build - otherwise it fails. I suspect the
-   ideal solution would be to add the ICU library from
-   http://site.icu-project.org/
-   but this option does allow R to build.
- * Ensure SAGE64 will add the -m64 option on any platform,
-   not just OS X as before.
- * Removed all references to the option --with-iconv=no,
-   as R needs iconv now - it is no longer optional - see
-   http://trac.sagemath.org/sage_trac/ticket/8191
- * Implement a test for X on Solaris, as the previous test in
-   spkg-install would always fail on Solaris, as Solaris
-   lacks the header file checked for, despite the fact X
-   support works fine. So now I check for a library on Solaris.
-
-=== r-2.10.1 (Karl-Dieter Crisman, January 15, 2010) ===
- * Readline import issue is now fixed in R
- * Re-enable recommended packages
- * Upgrade rpy2 to 2.0.8
- * FreeBSD support improved (patch by Peter Jeremy)
-
-=== r-2.9.2 (Jason Grout, Sept 20, 2009) ===
- * Also disable aqua support on 64 bit OSX
-
-=== r-2.6.1.p22 (Michael Abshoff, January 20th, 2009) ===
- * Also disable aqua support on 64 bit OSX
-
-=== r-2.6.1.p21 (Michael Abshoff, October 12th, 2008) ===
- * work around java infinite hang issue on OSX 10.5 (#4219)
-
-=== r-2.6.1.p20 (Michael Abshoff, September 30th, 2008) ===
- * set CPPFLAGS so that Sage's readline is picked up
-
-=== r-2.6.1.p19 (Michael Abshoff, September 1st, 2008) ===
- * Disabled libiconv support on Solaris
-
-=== r-2.6.1.p18 (Michael Abshoff, August 30th, 2008) ===
- * also disable aqua support on 32 bit Darwin
-
-=== r-2.6.1.p17 (Michael Abshoff, May 29th, 2008) ===
- * Use rpy-1.0.1.p2
-
-=== r-2.6.1.p16 (Michael Abshoff, May 28th, 2008) ===
- * add 64 bit OSX build support (#3196)
-
-=== r-2.6.1.p15 (Josh Kantor, April 12th, 2008) ===
- * make R help work (#2483)
-
-=== r-2.6.1.p14 (Michael Abshoff, Jan. 27th, 2008) ===
- * fix rpy build issue on OSX 10.4 (#1943)
-
-=== r-2.6.1.p13 (Michael Abshoff, Jan. 26th, 2008) ===
- * remove ATLAS and Lapack flags form configure for Darwin
-
-=== r-2.6.1.p12 (Michael Abshoff, Jan. 26th, 2008) ===
- * also delete all dylibs on OSX
- * added SAGE_LOCAL check to spkg-check, spkg-install
- * verify that rpy builds fine on OSX
- * remove tar.gzs from recommended directory
-
-=== r-2.6.1.p11 (Michael Abshoff, Jan. 26th, 2008) ===
- * fix rpy to work with ATLAS
- * fix parallel make since make install is broken with it.
- * remove various R libraries from SAGE_LOCAL/lib
-
-=== r-2.6.1.p10 (Michael Abshoff, Jan. 25th, 2008) ===
- * fix framework issue on OSX
- * flesh out SPKG.txt
-
-=== r-2.6.1.p9 (Michael Abshoff, Jan. 25th, 2008) ===
- * fix a shitload of build problems (#1852)
- * add ATLAS support
- * clean up, clean up, clean up
-
-=== r-2.6.1.p8 (Michael Abshoff, Jan. 17th. 2008) ===
- * bump version due to python now built with ucs4
-
-=== r-2.6.1.p7 ===
- * Updated the rpy package using trac #1427

build/pkgs/r/package-version.txt

@@ -1 +1 @@
-3.0.2.p0
+3.0.2.p1