[arch-commits] Commit in sage-mathematics/trunk (PKGBUILD fix-atlas.patch)

Evgeniy Alekseev arcanis at nymeria.archlinux.org
Wed Nov 6 19:54:28 UTC 2013


    Date: Wednesday, November 6, 2013 @ 20:54:28
  Author: arcanis
Revision: 100636

upgpkg: sage-mathematics 5.12-1

Update to 5.12-1

Added:
  sage-mathematics/trunk/fix-atlas.patch
Modified:
  sage-mathematics/trunk/PKGBUILD

-----------------+
 PKGBUILD        |  128 +++++++++++++++++++++++++++++-------------------------
 fix-atlas.patch |   10 ++++
 2 files changed, 81 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-06 19:53:24 UTC (rev 100635)
+++ PKGBUILD	2013-11-06 19:54:28 UTC (rev 100636)
@@ -1,71 +1,93 @@
 # $Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Osman Ugus <ugus11 at yahoo.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Antonio Rojas <nqn1976 at gmail dot com>
+# Contributor: Thomas Dziedzic <gostrc at gmail dot com>
+# Contributor: Osman Ugus <ugus11 at yahoo dot com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.11
+pkgver=5.12
 pkgrel=1
-pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
-url='http://www.sagemath.org'
+pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab"
 arch=('i686' 'x86_64')
+url="http://www.sagemath.org"
 license=('GPL')
-#depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo')
-depends=('desktop-file-utils')
-makedepends=('gcc-fortran' 'freetype2')
+#depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 'libxmu' 'sqlite' 'xz')
+makedepends=('gcc-fortran' 'freetype2' 'desktop-file-utils')
 optdepends=('imagemagick: some plotting functionality benefits from it'
             'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
             'openssh: to use the notebook in secure mode'
             'ffmpeg: to show animations'
             'cairo: R plots')
-install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
+        'fix-atlas.patch'
         'SAGE-notebook.desktop'
         'sage.service')
+install="${pkgname}.install"
+md5sums=('21d62a8a61e351c3c124167b3eead46f'
+         '527a621b19dd93941cd018d2c1559f96'
+         'b82f94383829eee26648feb977e2d89b'
+         '985da1c1d1dcdc3ea9aa73035cb7996b')
 
+prepare() {
+  # fix ATLAS build http://sourceforge.net/p/math-atlas/discussion/75123/thread/dc45bb67/
+  cd "sage-${pkgver}/spkg/standard"
+  tar xjf atlas-3.10.1.p5.spkg
+  rm atlas-3.10.1.p5.spkg
+  cd atlas-3.10.1.p5
+  patch -p0 -i "${srcdir}/fix-atlas.patch"
+  cd ..
+  tar cjf atlas-3.10.1.p5.spkg atlas-3.10.1.p5
+  rm -r atlas-3.10.1.p5
+  
+  # create DOT_SAGE directory
+  if [[ -d ${srcdir}/build ]]; then
+    rm -rf "${srcdir}/build"
+  fi
+  mkdir "${srcdir}/build"
+}
+
 build() {
-  cd sage-${pkgver}
-
+  cd "sage-${pkgver}"
+  
   # fix "missing sage.all error" during build
   unset CFLAGS
   unset CXXFLAGS
-
   # fix build errors
   unset LDFLAGS
-
-  # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
+  
   export MAKE="make -j$(nproc)"
-
+  
   # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
   export FC=/usr/bin/gfortran
-
+  
   # disable building with debugging support
   export SAGE_DEBUG='no'
-
+  
   # enable fat binaries (disables processor specific optimizations)
   # comment out if you're only building it for yourself
   export SAGE_FAT_BINARY='yes'
-
+  
   # can't write to root in a clean chroot
-  mkdir "$srcdir/buiild"
-  export DOT_SAGE="$srcdir/build"
-
-  # Singular is broken
+  export DOT_SAGE="${srcdir}/build"
+  
+  # singular is broken
   export CPP='/usr/bin/cpp'
-
+  
   # only build sage, no documents
   #make build
   make
-  ./sage --bdist "$pkgver"
+  ./sage --bdist "${pkgver}"
 }
 
 << COMMENT
 check() {
-  cd sage-${pkgver}
-
+  cd "sage-${pkgver}"
+  
+  make test
+  
   # uncomment if we want to run all the tests (warning: very long)
   #make ptestlong
 }
@@ -72,40 +94,32 @@
 COMMENT
 
 package() {
-  cd sage-${pkgver}
-
+  cd "sage-${pkgver}"
+  
   # cp because make install is experimental and will corrupt the install
-  install -d ${pkgdir}/opt/sage
-  cp -dpr --no-preserve=ownership dist/sage-"$pkgver-$CARCH-Linux/"* ${pkgdir}/opt/sage/
-
+  install -d "${pkgdir}/opt/sage"
+  cp -dpr --no-preserve=ownership dist/sage-"${pkgver}-$CARCH-Linux/"* "${pkgdir}/opt/sage/"
+  
   # move SageTeX files to more appropriate directory
-  install -d ${pkgdir}/usr/share
-  mv ${pkgdir}/opt/sage/local/share/texmf \
-    ${pkgdir}/usr/share
-
-  desktop-file-install ${srcdir}/SAGE-notebook.desktop \
-    --dir ${pkgdir}/usr/share/applications 
-
+  install -d "${pkgdir}/usr/share"
+  mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share"
+  
   # create link to main binary
-  install -d ${pkgdir}/usr/bin
-  ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
-
+  install -d "${pkgdir}/usr/bin"
+  ln -s "/opt/sage/sage" "${pkgdir}/usr/bin/sage"
+  
   # remove build logs
-  rm -f ${pkgdir}/opt/sage/*.log
-  rm -rf ${pkgdir}/opt/sage/spkg/logs
-
+  rm -f "${pkgdir}/opt/sage/*.log"
+  rm -rf "${pkgdir}/opt/sage/spkg/logs"
+  
   # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
-  rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
-  rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
-
+  rm -f "${pkgdir}/opt/sage/spkg/base/*spkg"
+  rm -f "${pkgdir}/opt/sage/spkg/standard/*spkg"
+  
   # install a systemd user unit
-  install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service
+  install -Dm755 "${srcdir}/sage.service" "${pkgdir}/usr/lib/systemd/user/sage.service"
+  # install desktop file
+  desktop-file-install "${srcdir}/SAGE-notebook.desktop" --dir "${pkgdir}/usr/share/applications"
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
-         'b82f94383829eee26648feb977e2d89b'
-         '985da1c1d1dcdc3ea9aa73035cb7996b')
-md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
-         'b82f94383829eee26648feb977e2d89b'
-         '985da1c1d1dcdc3ea9aa73035cb7996b')

Added: fix-atlas.patch
===================================================================
--- fix-atlas.patch	                        (rev 0)
+++ fix-atlas.patch	2013-11-06 19:54:28 UTC (rev 100636)
@@ -0,0 +1,10 @@
+--- spkg-install	2013-08-30 21:57:13.000000000 +0200
++++ spkg-install.new	2013-10-11 23:40:10.772191176 +0200
+@@ -296,6 +296,7 @@
+     cmd += ' --prefix=' + conf['SAGE_LOCAL']
+     cmd += ' --with-netlib-lapack-tarfile=' + LAPACK_TARFILE 
+     cmd += ' --cc="' + CC + '"'
++    cmd += ' -D c -DWALL'
+ 
+     ## -Si latune 1: enable lapack tuning 
+     ## typically adds 3-4 hours of install time




More information about the arch-commits mailing list