Date: Friday, April 8, 2016 @ 20:08:24 Author: arojas Revision: 169771
gmp-ecm 7.0 rebuild, add patch to fix build with unpatched cython Added: sagemath/trunk/cython-sys-path.patch Modified: sagemath/trunk/PKGBUILD sagemath/trunk/env.patch -----------------------+ PKGBUILD | 11 +++++++---- cython-sys-path.patch | 10 ++++++++++ env.patch | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-08 17:44:19 UTC (rev 169770) +++ PKGBUILD 2016-04-08 18:08:24 UTC (rev 169771) @@ -9,7 +9,7 @@ pkgname=sagemath pkgver=7.1 -pkgrel=4 +pkgrel=6 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(i686 x86_64) url="http://www.sagemath.org"; @@ -25,7 +25,7 @@ 'modular_decomposition: modular decomposition of graphs' 'ffmpeg: to export animations to video' 'imagemagick: to show animations' 'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'gap-data: for computing Galois groups' 'jupyter-notebook: Jupyter notebook interface' 'atlas-lapack: improved performance for some linear algebra operations') -makedepends=(cython2-devel boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc +makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc mcqd coxeter3 cryptominisat modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes conflicts=(sage-mathematics) replaces=(sage-mathematics) @@ -32,16 +32,17 @@ provides=(sage-mathematics) source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"; pexpect.zip::"https://github.com/pexpect/pexpect/archive/524495960dd8898ddd30f7ba37298de51beee773.zip"; - anal.h package.patch env.patch paths.patch clean.patch skip-check.patch + anal.h package.patch env.patch paths.patch clean.patch skip-check.patch cython-sys-path.patch disable-fes.patch jupyter-path.patch test-optional.patch python-2.7.11.patch gap-4.8.patch) md5sums=('c68e846444b9370fe79f43395cdc2725' 'a346bb2c0350c1cb17d5325235c5e38a' 'a906a180d198186a39820b0a2f9a9c63' '9ba81f717ffd4e20b8b2f2a318307488' - '21010618e80fc28582a84695a1fed0e5' + 'f6c62f0ccc168c5e6e3dd9d6f73f6389' '0f746ed394fd7eb7a6b3963014976098' '6d9ae0978ce6a05a0da2cafdfb178a09' '5947a420a0b1483f0cbc74c76895789b' + 'a1bcdd3fe620dbae60ed8b0e98b2ece7' '4eb23a3c7363258bc9ba764d6e5512ba' '16b529194c6105c3364127bd8f1efa83' 'cdcabd475b80afe0534a5621e972736e' @@ -79,6 +80,8 @@ patch -p0 -i ../jupyter-path.patch # fix timeit with Python 2.7.11 patch -p0 -i ../python-2.7.11.patch +# search system paths for cython includes + patch -p1 -i ../cython-sys-path.patch # Upstream patches # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 Added: cython-sys-path.patch =================================================================== --- cython-sys-path.patch (rev 0) +++ cython-sys-path.patch 2016-04-08 18:08:24 UTC (rev 169771) @@ -0,0 +1,10 @@ +--- sage-7.1/src/setup.py.orig 2016-04-08 16:59:24.691349473 +0000 ++++ sage-7.1/src/setup.py 2016-04-08 17:03:03.847153796 +0000 +@@ -591,6 +591,7 @@ + build_dir=SAGE_CYTHONIZED, + force=force, + aliases=aliases, ++ include_path=sys.path, + compiler_directives={ + 'embedsignature': True, + 'profile': profile, Modified: env.patch =================================================================== --- env.patch 2016-04-08 17:44:19 UTC (rev 169770) +++ env.patch 2016-04-08 18:08:24 UTC (rev 169771) @@ -67,7 +67,7 @@ +export SAGE_SHARE="$SAGE_LOCAL/share/sage" +export SAGE_EXTCODE="$SAGE_SHARE/ext" +export SAGE_SRC="$SAGE_SHARE/source" -+export SAGE_DOC_SRC="$SAGE_SRC/doc" ++export SAGE_DOC_SRC="/usr/share/doc/sage" +export SAGE_DOC="/usr/share/doc/sage" # We offer a toolchain option, so if $SAGE_LOCAL/toolchain/toolchain-env exists source it.
