Build extensions separately

3 files changed, 13 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a33197f405b8..fbe79f8515ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sagemath-git
 	pkgdesc = Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab
-	pkgver = 10.1.beta7.r0.g543f8d62b0
+	pkgver = 10.1.beta8.r0.g26f5a09baf
 	pkgrel = 1
 	url = http://www.sagemath.org
 	arch = x86_64
@@ -99,11 +99,9 @@ pkgbase = sagemath-git
 	provides = sagemath
 	conflicts = sagemath
 	source = git+https://github.com/sagemath/sage#branch=develop
-	source = sagemath-optional-packages.patch
 	source = latte-count.patch
 	source = sagemath-tdlib-0.9.patch
 	sha256sums = SKIP
-	sha256sums = 8a5b935d2fd8815489713db6497e9d44aefd61e8553e8cd4acc2cb1adf625ccc
 	sha256sums = 5cd2f88965d7ebab9dfab6f5c2040d363a4a5ae41230219cc7070b907381da5a
 	sha256sums = 56a83abecf2ff5a500442adc7a50abbb70006037dd39c39dcdb04b3ca9fb51e2
 
diff --git a/PKGBUILD b/PKGBUILD
index 810b922f9848..0ac2dbb14987 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
 
 pkgname=sagemath-git
-pkgver=10.1.beta7.r0.g543f8d62b0
+pkgver=10.1.beta8.r0.g26f5a09baf
 pkgrel=1
 pkgdesc='Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab'
 arch=(x86_64)
@@ -56,13 +56,12 @@ makedepends=(cython0 boost python-jinja sirocco mcqd coxeter bliss tdlib python-
 conflicts=(sagemath)
 provides=(sagemath)
 source=(git+https://github.com/sagemath/sage#branch=develop
-        sagemath-optional-packages.patch
         latte-count.patch
         sagemath-tdlib-0.9.patch)
 sha256sums=('SKIP'
-            '8a5b935d2fd8815489713db6497e9d44aefd61e8553e8cd4acc2cb1adf625ccc'
             '5cd2f88965d7ebab9dfab6f5c2040d363a4a5ae41230219cc7070b907381da5a'
             '56a83abecf2ff5a500442adc7a50abbb70006037dd39c39dcdb04b3ca9fb51e2')
+_pkgs=(standard mcqd tdlib coxeter3 sirocco meataxe bliss)
 
 pkgver() {
   cd sage
@@ -72,8 +71,6 @@ pkgver() {
 prepare(){
   cd sage
 
-# assume all optional packages are installed
-  patch -p1 -i ../sagemath-optional-packages.patch
 # use correct latte-count binary name
   patch -p1 -i ../latte-count.patch
 # update to tdlib 0.9 (Fedora)
@@ -83,17 +80,20 @@ prepare(){
 }
 
 build() {
-  cd sage/pkgs/sagemath-standard
-
   export SAGE_NUM_THREADS=10
-  export PYTHONPATH="$PWD"/../sage-setup
-  python setup.py build
+  export PYTHONPATH="$PWD"/sage/pkgs/sage-setup
+
+  for _pkg in ${_pkgs[@]}; do
+    cd "$srcdir"/sage/pkgs/sagemath-$_pkg
+    python setup.py build
+  done
 }
 
 package() {
-  cd sage/pkgs/sagemath-standard
-
-  python setup.py install --root="$pkgdir" --optimize=1
+  for _pkg in ${_pkgs[@]}; do
+    cd "$srcdir"/sage/pkgs/sagemath-$_pkg
+    python setup.py install --root="$pkgdir" --optimize=1
+  done
 
 # fix symlinks to assets
   _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
diff --git a/sagemath-optional-packages.patch b/sagemath-optional-packages.patch
deleted file mode 100644
index 3051b9e938fc..000000000000
--- a/sagemath-optional-packages.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py
-index 6744236593..a038006449 100755
---- a/pkgs/sagemath-standard/setup.py
-+++ b/pkgs/sagemath-standard/setup.py
-@@ -81,8 +81,7 @@ else:
- optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib',
-                                      'coxeter3', 'sirocco', 'meataxe']
- distributions += ['sagemath-{}'.format(pkg)
--                  for pkg in optional_packages_with_extensions
--                  if is_package_installed_and_updated(pkg)]
-+                  for pkg in optional_packages_with_extensions]
- log.warn('distributions = {0}'.format(distributions))
- from sage_setup.find import find_python_sources, find_extra_files
- python_packages, python_modules, cython_modules = find_python_sources(