[arch-commits] Commit in sagemath/trunk (PKGBUILD env.patch sagemath-gslcblas.patch)

[Antonio Rojas]

    Date: Thursday, January 12, 2017 @ 16:53:13
  Author: arojas
Revision: 207027

Fix cblas linking in gsl module

Added:
  sagemath/trunk/sagemath-gslcblas.patch
Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/env.patch

-------------------------+
 PKGBUILD                |   11 +++++++----
 env.patch               |    3 ++-
 sagemath-gslcblas.patch |   18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-12 16:53:12 UTC (rev 207026)
+++ PKGBUILD	2017-01-12 16:53:13 UTC (rev 207027)
@@ -10,7 +10,7 @@
 pkgbase=sagemath
 pkgname=(sagemath sagemath-jupyter)
 pkgver=7.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=(i686 x86_64)
 url="http://www.sagemath.org"
@@ -33,9 +33,9 @@
   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)
+        jupyter-path.patch test-optional.patch ecm-7.patch increase-rtol.patch sagemath-gslcblas.patch)
 md5sums=('bff1fb8793ebc2934d14cf1efdcfbea3'
-         '784ba3fca83f24ed0bbf62e01fa4e967'
+         '70b7c1c5da6400e1ae48cf1e5a2d2879'
          '6cafcb381437d4751fd55b25d5090987'
          '0de8f29a99a48e2ca2a13045f122c386'
          '409b0a2c520eb33281b5f262afcb6c76'
@@ -44,7 +44,8 @@
          '0d88207416dfb98a17bf8886257d9a02'
          '921017fd2d9dadbb6b602ac0476bfd58'
          '0c9a57d35de80c2cd418ebec912efbbb'
-         '39d3fded716d2a7ae0ab03e0896b7497')
+         '39d3fded716d2a7ae0ab03e0896b7497'
+         'a3ca7c861c19eb1c605a43641cb6923f')
 
 prepare(){
   cd sage-$pkgver
@@ -74,6 +75,8 @@
   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: env.patch
===================================================================
--- env.patch	2017-01-12 16:53:12 UTC (rev 207026)
+++ env.patch	2017-01-12 16:53:13 UTC (rev 207027)
@@ -52,12 +52,13 @@
  fi
  
  # sage-env must know where the Sage's script files are
-@@ -233,8 +233,8 @@
+@@ -233,8 +233,9 @@
  export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
  export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
  export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
 -export SAGE_SRC="$SAGE_ROOT/src"
 -export SAGE_DOC_SRC="$SAGE_SRC/doc"
++export GAP_ROOT_DIR="/usr/lib/gap"
 +export SAGE_SRC="$SAGE_SHARE/sage/source"
 +export SAGE_DOC_SRC="$SAGE_SHARE/doc/sage"
  export SAGE_DOC="$SAGE_SHARE/doc/sage"

Added: sagemath-gslcblas.patch
===================================================================
--- sagemath-gslcblas.patch	                        (rev 0)
+++ sagemath-gslcblas.patch	2017-01-12 16:53:13 UTC (rev 207027)
@@ -0,0 +1,18 @@
+diff --git a/src/module_list.py b/src/module_list.py
+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
+ gsl_pc = pkgconfig.parse('gsl')
+ gsl_libs = gsl_pc['libraries']
+-gsl_libs.remove('gslcblas')
+ gsl_library_dirs = gsl_pc['library_dirs']
+ gsl_include_dirs = gsl_pc['include_dirs']
+ 
+