Date: Sunday, January 15, 2017 @ 20:29:34 Author: arojas Revision: 207495
Update to 7.5.1 Modified: sagemath/trunk/PKGBUILD sagemath/trunk/sagemath-gslcblas.patch -------------------------+ PKGBUILD | 34 +++++++++++++++++----------------- sagemath-gslcblas.patch | 11 +++-------- 2 files changed, 20 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-15 20:17:10 UTC (rev 207494) +++ PKGBUILD 2017-01-15 20:29:34 UTC (rev 207495) @@ -9,8 +9,8 @@ pkgbase=sagemath pkgname=(sagemath sagemath-jupyter) -pkgver=7.5 -pkgrel=2 +pkgver=7.5.1 +pkgrel=1 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab" arch=(i686 x86_64) url="http://www.sagemath.org"; @@ -29,23 +29,23 @@ 'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'libhomfly: for computing the homfly polynomial of links' 'libbraiding: for computing in braid groups' 'python2-pynormaliz: Normaliz backend for polyhedral computations') -makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc libhomfly libbraiding +makedepends=(cython2 boost ratpoints symmetrica python2-jinja coin-or-cbc libhomfly libbraiding mcqd coxeter3 cryptominisat2 modular_decomposition bliss-graphs tdlib python2-pkgconfig meataxe) # libfes source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz"; env.patch skip-check.patch cython-sys-path.patch is-package-installed.patch package.patch disable-fes.patch jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch sagemath-gslcblas.patch) -md5sums=('bff1fb8793ebc2934d14cf1efdcfbea3' - '70b7c1c5da6400e1ae48cf1e5a2d2879' - '6cafcb381437d4751fd55b25d5090987' - '0de8f29a99a48e2ca2a13045f122c386' - '409b0a2c520eb33281b5f262afcb6c76' - 'ccfd5b1bc4796f414f1531be52504dd7' - '06a67e611d10aa2381efe1f08ea4ffd9' - '0d88207416dfb98a17bf8886257d9a02' - '921017fd2d9dadbb6b602ac0476bfd58' - '0c9a57d35de80c2cd418ebec912efbbb' - '39d3fded716d2a7ae0ab03e0896b7497' - 'a3ca7c861c19eb1c605a43641cb6923f') +sha256sums=('3cd9af3e3bfd7f5cc966b7c36168d04b9a1213aa9a7af3286b5d53d40e7653e3' + '9dba04ff13626a7b6c338a8b18a6c27d343f68a547a218533cf773af3dae6635' + 'b02b3d2d5620ca20f96adb62b6fef05e4676c0a60983310a1450fdf3d923cb04' + 'ff7e034d08ab084fdb193484f7fe3a659ebcd8ab33a2b7177237d65b26de7872' + 'd60fb0fbd27991ce9496ca035a54b03334b5b53f244227a8d6e13f3327ce75d2' + '4a2297e4d9d28f0b3a1f58e1b463e332affcb109eafde44837b1657e309c8212' + '7ab53d30b877dabb6835fbe67a208bef65fa0aaf40221b4d0b58e4b7086bc47a' + '775051aa9076ebf631c8a291af38b6ec4a13c904740dc9da831641d592d8bcd8' + '81d08c6a760f171f3381455b66a6c84789c9f0eefddbe6ca5794075514ad8c3a' + '65ad84c83d5f956fde8eab961f2caad56d64044324c4abc0e56bcd9f44061cb6' + 'be925eefeac3f28e639794ddc20d64e6faafd7181804e29417a510224d19ccc7' + '973224f53e9a6fcfaa9c6cb842b02430a601d1c7ce0abb41b3591470d128930c') prepare(){ cd sage-$pkgver @@ -67,6 +67,8 @@ patch -p1 -i ../ecm-7.patch # increase numerical tolerance, needed by scipy 0.18 patch -p1 -i ../increase-rtol.patch +# fix cblas linking in gsl modules + patch -p1 -i ../sagemath-gslcblas.patch # Upstream patches # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 @@ -75,8 +77,6 @@ patch -p0 -i ../disable-fes.patch # replace is_package_installed usage http://trac.sagemath.org/ticket/20377 patch -p1 -i ../is-package-installed.patch -# don't remove gslcblas from gsl libraries https://trac.sagemath.org/ticket/22085 - patch -p1 -i ../sagemath-gslcblas.patch # use python2 sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/* Modified: sagemath-gslcblas.patch =================================================================== --- sagemath-gslcblas.patch 2017-01-15 20:17:10 UTC (rev 207494) +++ sagemath-gslcblas.patch 2017-01-15 20:29:34 UTC (rev 207495) @@ -2,16 +2,11 @@ index 96e8081..4728e9a 100644 --- a/src/module_list.py +++ b/src/module_list.py -@@ -40,11 +40,10 @@ givaro_library_dirs = givaro_pc['library_dirs'] - givaro_cflags = pkgconfig.cflags('givaro').split() - - # GNU Scientific Library --# Note we remove the built-in gslcblas -+# The default gslcblas is removed in the gsl spkg - not need to remove it. - # The above cblas should already be in the list thanks to #20646 +@@ -45,6 +45,7 @@ givaro_library_dirs = givaro_pc['library_dirs'] gsl_pc = pkgconfig.parse('gsl') gsl_libs = gsl_pc['libraries'] --gsl_libs.remove('gslcblas') + gsl_libs.remove('gslcblas') ++gsl_libs.extend(cblas_libs) gsl_library_dirs = gsl_pc['library_dirs'] gsl_include_dirs = gsl_pc['include_dirs']
