[arch-commits] Commit in sage-mathematics/trunk (4 files)
Antonio Rojas
arojas at archlinux.org
Tue Feb 17 09:12:07 UTC 2015
Date: Tuesday, February 17, 2015 @ 10:12:07
Author: arojas
Revision: 127835
Sage 6.5
Added:
sage-mathematics/trunk/anal.h
sage-mathematics/trunk/tests_parallel.patch
Modified:
sage-mathematics/trunk/PKGBUILD
sage-mathematics/trunk/env.patch
----------------------+
PKGBUILD | 28 +++++++++++++--------
anal.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++
env.patch | 19 +++++++++-----
tests_parallel.patch | 14 ++++++++++
4 files changed, 109 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-17 09:09:28 UTC (rev 127834)
+++ PKGBUILD 2015-02-17 09:12:07 UTC (rev 127835)
@@ -8,14 +8,14 @@
# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
pkgname=sage-mathematics
-pkgver=6.4.1
-pkgrel=9
+pkgver=6.5
+pkgrel=1
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
arch=('i686' 'x86_64')
url="http://www.sagemath.org"
license=('GPL')
depends=('ipython2' 'ppl' 'glpk' 'mpfi' 'palp' 'polybori' 'singular' 'libcliquer' 'maxima-ecl' 'gfan' 'sympow' 'tachyon' 'python2-rpy2'
- 'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 'libgap' 'gap' 'genus2reduction' 'flintqs' 'lcalc'
+ 'python2-matplotlib' 'python2-scipy' 'python2-sympy' 'python2-networkx' 'libgap' 'gap' 'flintqs' 'lcalc' 'lrcalc'
'eclib' 'gmp-ecm' 'zn_poly' 'python2-gd' 'python2-cvxopt' 'pynac' 'linbox' 'gsl' 'rubiks' 'pari-galdata' 'pari-seadata-small'
'sage-data-combinatorial_designs' 'sage-data-elliptic_curves' 'sage-data-graphs' 'sage-data-polytopes_db' 'sage-data-conway_polynomials')
optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface'
@@ -24,17 +24,18 @@
'coin-or-cbc: COIN backend for numerical computations' 'nauty: for generating some classes of graphs'
'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids'
'libfes: exhaustive search of solutions for boolean polynomial systems' 'lrs: computing volume of polytopes'
- 'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'lrcalc: fast computation of LR coefficients')
+ 'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver')
makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'python2-jinja' 'coin-or-cbc' 'mcqd' 'libfes' 'coxeter3'
- 'cryptominisat' 'lrcalc')
+ 'cryptominisat')
source=("https://github.com/sagemath/sage/archive/$pkgver.tar.gz" "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2"
-'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 'clean.patch' 'skip-check.patch'
-'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch')
-md5sums=('e40736461992e62af3a84cf9a212c9d1'
+'anal.h' 'package.patch' 'c_lib.patch' 'env.patch' 'paths.patch' 'blas.patch' 'clean.patch' 'skip-check.patch'
+'pexpect-env.patch' 'pexpect-del.patch' 'fes02.patch' 'tests_parallel.patch')
+md5sums=('5a173b1ecce89c845626653cfb3d199f'
'd9a3e113ed147dcee8f89962a8dccd43'
+ 'a906a180d198186a39820b0a2f9a9c63'
'0eb5ac1537aac93bd67a2925c0cfd84d'
'5216dbb3d80cecc8ec4a36cc9706f8b5'
- 'b980378df4bff2cd1ca002bbfae995a2'
+ '563bc42699116d71ca6b06b9f149304e'
'9a39301dedeb560f7bfddb81b6853f28'
'eee444d32b8a818a67b1e0ce0850b8bb'
'46c212a3a6713b0f78c370c7186d0982'
@@ -41,7 +42,8 @@
'5947a420a0b1483f0cbc74c76895789b'
'a83a3b1bc7fcb7cbf752a83a8311fc42'
'f333939ea6c41377b66407c81016cee4'
- '506944613082ba7f5b34360939ca90eb')
+ '506944613082ba7f5b34360939ca90eb'
+ 'f65910f4644cfe892d95e401ffb85fb6')
# changelog=ChangeLog
prepare(){
@@ -72,6 +74,8 @@
sed -e "s|is_package_installed('database_cremona_ellcurve')|False|" -i src/sage/databases/cremona.py
# fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
patch -p0 -i $srcdir/fes02.patch
+# remove missing cython source - fixes build with cython 0.22 http://trac.sagemath.org/ticket/17657
+ patch -p0 -i $srcdir/tests_parallel.patch
# use python2
sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i src/bin/*
@@ -81,6 +85,10 @@
sed -e 's|exec ipython|exec ipython2|' -e 's|cygdb|cygdb2|' -i src/bin/sage
sed -e "s|'cython'|'cython2'|" -i src/bin/sage-cython
+# copy required private PARI header
+ mkdir -p src/pari
+ cp $srcdir/anal.h src/pari/anal.h
+
cd $srcdir/pexpect-2.0
# fix env in pexpect
patch -p1 -i $srcdir/pexpect-env.patch
Added: anal.h
===================================================================
--- anal.h (rev 0)
+++ anal.h 2015-02-17 09:12:07 UTC (rev 127835)
@@ -0,0 +1,65 @@
+/* Copyright (C) 2000 The PARI group.
+
+This file is part of the PARI/GP package.
+
+PARI/GP is free software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation. It is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY WHATSOEVER.
+
+Check the License for details. You should have received a copy of it, along
+with the package; see the file 'COPYING'. If not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+/*************************************************************************/
+/* */
+/* Declarations specific to the analyzer */
+/* */
+/*************************************************************************/
+BEGINEXTERN
+/* GP control structures */
+#define EXPR_WRAP(code, call) \
+{ GEN z; GEN __E = code; \
+ push_lex(gen_0, __E); z = call; pop_lex(1); return z; }
+#define EXPR_ARG __E, &gp_eval
+#define EXPR_ARGUPTO __E, &gp_evalupto
+#define EXPR_ARGBOOL __E, &gp_evalbool
+
+/* functions */
+void changevalue(entree *ep, GEN val);
+void freeep(entree *ep);
+void pari_fill_hashtable(entree **table, entree *ep);
+
+void compile_err(const char *msg, const char *str);
+void compile_varerr(const char *str);
+
+#ifdef STACK_CHECK
+extern THREAD void *PARI_stack_limit;
+#endif
+
+extern entree **varentries;
+
+struct node_loc
+{
+ const char *start,*end;
+};
+
+union token_value { long val; };
+
+int pari_lex(union token_value *yylval, struct node_loc *yylloc, char **lex);
+int pari_parse(char **lex);
+entree* fetch_entry(const char *s, long len);
+entree* fetch_member(const char *s, long len);
+void pari_close_parser(void);
+void pari_close_compiler(void);
+void pari_close_evaluator(void);
+void pari_init_parser(void);
+void pari_init_compiler(void);
+void pari_init_evaluator(void);
+void optimizenode(long n);
+void push_frame(GEN C, long lpc, long flag);
+const char * closure_func_err(void);
+GEN gp_closure(long n);
+long eval_mnemonic(GEN str, const char *tmplate);
+
+ENDEXTERN
Modified: env.patch
===================================================================
--- env.patch 2015-02-17 09:09:28 UTC (rev 127834)
+++ env.patch 2015-02-17 09:12:07 UTC (rev 127835)
@@ -1,5 +1,5 @@
---- src/bin/sage-env.orig 2014-12-18 09:56:45.542896161 +0100
-+++ src/bin/sage-env 2014-12-18 09:57:25.173009379 +0100
+--- src/bin/sage-env.orig 2015-01-06 10:46:04.469687605 +0100
++++ src/bin/sage-env 2015-01-06 10:49:59.547762019 +0100
@@ -110,41 +110,7 @@
}
@@ -43,7 +43,7 @@
# Don't execute the commands more than once for the same version of
# sage-env. Check this after checking the validity of SAGE_ROOT, but
-@@ -245,15 +211,12 @@
+@@ -245,20 +211,12 @@
fi
# Setting Sage-related location environment variables.
@@ -55,6 +55,11 @@
-export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
-export SAGE_SRC="$SAGE_ROOT/src"
-export SAGE_DOC="$SAGE_SRC/doc"
+-
+-if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
+- SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
+- SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET
+-fi
-export PATH="$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
+export SAGE_LOCAL="$SAGE_ROOT"
+export SAGE_ETC="/etc/sage"
@@ -65,7 +70,7 @@
# We offer a toolchain option, so if $SAGE_LOCAL/toolchain/toolchain-env exists source it.
# Since the user might do something crazy we do not do any checks, but hope for the best.
-@@ -304,9 +266,6 @@
+@@ -309,9 +267,6 @@
GIT_TEMPLATE_DIR="$SAGE_LOCAL"/share/git-core/templates && export GIT_TEMPLATE_DIR
GIT_EXEC_PATH="$SAGE_LOCAL"/libexec/git-core && export GIT_EXEC_PATH
@@ -75,7 +80,7 @@
if [ "$SAGE_SERVER" = "" ]; then
SAGE_SERVER="http://www.sagemath.org/"
export SAGE_SERVER
-@@ -358,25 +317,17 @@
+@@ -363,25 +318,17 @@
export SAGE_STARTUP_FILE
fi
@@ -106,7 +111,7 @@
if [ -z "${SAGE_ORIG_LD_LIBRARY_PATH_SET}" ]; then
SAGE_ORIG_LD_LIBRARY_PATH=$LD_LIBRARY_PATH && export SAGE_ORIG_LD_LIBRARY_PATH
-@@ -424,8 +375,6 @@
+@@ -429,8 +376,6 @@
unset R_HOME
unset R_PROFILE
@@ -115,7 +120,7 @@
############ architecture flags
# Support flags to change the build architecture. Currently, this is
-@@ -588,9 +537,6 @@
+@@ -602,9 +547,6 @@
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
fi
Added: tests_parallel.patch
===================================================================
--- tests_parallel.patch (rev 0)
+++ tests_parallel.patch 2015-02-17 09:12:07 UTC (rev 127835)
@@ -0,0 +1,14 @@
+--- src/module_list.py.orig 2015-02-15 00:13:10.878070678 +0100
++++ src/module_list.py 2015-02-15 00:13:26.514831552 +0100
+@@ -2092,11 +2092,6 @@
+ Extension('sage.tests.interrupt',
+ sources = ['sage/tests/interrupt.pyx', 'sage/tests/c_lib.c']),
+
+- Extension('sage.tests.parallel',
+- sources = ['sage/tests/parallel.pyx'],
+- extra_compile_args=["-fopenmp"],
+- extra_link_args=["-fopenmp"]),
+-
+ Extension('sage.tests.stl_vector',
+ sources = ['sage/tests/stl_vector.pyx'],
+ libraries = ['gmp'],
More information about the arch-commits
mailing list