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

[Antonio Rojas]

    Date: Tuesday, May 19, 2015 @ 00:41:17
  Author: arojas
Revision: 133742

Build fixes

Modified:
  sagemath/trunk/PKGBUILD
  sagemath/trunk/env.patch

-----------+
 PKGBUILD  |   11 ++++++++---
 env.patch |   16 ++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-18 20:15:24 UTC (rev 133741)
+++ PKGBUILD	2015-05-18 22:41:17 UTC (rev 133742)
@@ -26,8 +26,8 @@
   'libfes: exhaustive search of solutions for boolean polynomial systems' 'modular_decomposition: modular decomposition of graphs'
   'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'imagemagick: to show animations'
   'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'arb: floating-point ball arithmetic')
-makedepends=('cython2' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'python2-jinja' 'coin-or-cbc' 'mcqd' 'libfes' 'coxeter3'
-  'cryptominisat' 'arb' 'modular_decomposition' 'bliss-graphs')
+makedepends=('cython2-devel' 'boost' 'scons' 'ratpoints' 'symmetrica' 'fflas-ffpack' 'python2-jinja' 'coin-or-cbc'
+  'mcqd' 'libfes' 'coxeter3' 'cryptominisat' 'arb' 'modular_decomposition' 'bliss-graphs')
 conflicts=('sage-mathematics')
 replaces=('sage-mathematics')
 provides=('sage-mathematics')
@@ -40,7 +40,7 @@
          'a906a180d198186a39820b0a2f9a9c63'
          '0eb5ac1537aac93bd67a2925c0cfd84d'
          'c452558d3496b07be472dad57195d45d'
-         '293daf2f520cc07b93ed30eabf1d40d3'
+         '3fc9a5bb250896533365c30c2b926e3c'
          '020bdb34b6fc0f2c9f46341bdb79937a'
          '46c212a3a6713b0f78c370c7186d0982'
          '5947a420a0b1483f0cbc74c76895789b'
@@ -78,6 +78,10 @@
    -i src/sage/databases/cremona.py
 # fix IPython kernel path
   sed -e "s|os.path.join(SAGE_ROOT, 'sage')|'/usr/bin/sage'|" -i src/sage/repl/ipython_kernel/install.py
+# find bliss headers
+  sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx
+# Rename class to fix conflicts with NTL
+  sed -e 's|WrappedPtr|SageWrappedPtr|' -i src/sage/libs/polybori/decl.pxd -i src/sage/libs/polybori/pb_wrap.h  
 
 # Upstream patches  
 # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209
@@ -112,6 +116,7 @@
 
   export SAGE_LOCAL="/usr"
   export SAGE_SRC="$PWD"
+  export CC=gcc
 
   pushd c_lib
     CXX=g++ UNAME=Linux SAGE64=auto scons

Modified: env.patch
===================================================================
--- env.patch	2015-05-18 20:15:24 UTC (rev 133741)
+++ env.patch	2015-05-18 22:41:17 UTC (rev 133742)
@@ -70,25 +70,17 @@
  
  # 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.
-@@ -309,9 +267,15 @@
+@@ -309,9 +267,7 @@
  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
  
 -SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
 -SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
-+if [ "$SAGE_SERVER" = "" ]; then
-+    SAGE_SERVER="http://www.sagemath.org/"
-+    export SAGE_SERVER
-+fi
  
-+if [ "$SAGE_UPSTREAM" = "" ]; then
-+    SAGE_UPSTREAM="${SAGE_SERVER}packages/upstream"
-+    export SAGE_UPSTREAM
-+fi
  if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
      SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
      export SAGE_REPO_ANONYMOUS
-@@ -354,25 +318,17 @@
+@@ -346,25 +310,17 @@
      export SAGE_STARTUP_FILE
  fi
  
@@ -119,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
-@@ -420,8 +376,6 @@
+@@ -412,8 +368,6 @@
  unset R_HOME
  unset R_PROFILE
  
@@ -128,7 +120,7 @@
  ############ architecture flags
  
  # Support flags to change the build architecture.  Currently, this is
-@@ -593,9 +547,6 @@
+@@ -585,9 +539,6 @@
      LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
  fi