diff options
Diffstat (limited to 'var')
5 files changed, 3 insertions, 40 deletions
diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index f54cb8a34d..91551e72c5 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -22,7 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## -from spack.build_systems.cuda import CudaPackage from spack import * from spack.package_test import compare_output from spack.util.executable import Executable diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 593b9511ea..c64552478f 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -from spack.build_systems.cuda import CudaPackage class Dealii(CMakePackage, CudaPackage): diff --git a/var/spack/repos/builtin/packages/octave-optim/package.py b/var/spack/repos/builtin/packages/octave-optim/package.py index 2c676f28dc..0091e66496 100644 --- a/var/spack/repos/builtin/packages/octave-optim/package.py +++ b/var/spack/repos/builtin/packages/octave-optim/package.py @@ -23,10 +23,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os -class OctaveOptim(Package): +class OctaveOptim(OctavePackage): """Non-linear optimization toolkit for Octave.""" homepage = "https://octave.sourceforge.io/optim/" @@ -35,16 +34,4 @@ class OctaveOptim(Package): version('1.5.2', 'd3d77982869ea7c1807b13b24e044d44') depends_on('octave-struct@1.0.12:') - extends('octave@3.6.0:') - - def install(self, spec, prefix): - os.environ.pop('CC', '') - os.environ.pop('CXX', '') - os.environ.pop('FC', '') - octave('--quiet', - '--norc', - '--built-in-docstrings-file=/dev/null', - '--texi-macros-file=/dev/null', - '--eval', 'pkg prefix %s; pkg install %s' % - (prefix, self.stage.archive_file)) diff --git a/var/spack/repos/builtin/packages/octave-splines/package.py b/var/spack/repos/builtin/packages/octave-splines/package.py index c9a5f7b01d..79341807c6 100644 --- a/var/spack/repos/builtin/packages/octave-splines/package.py +++ b/var/spack/repos/builtin/packages/octave-splines/package.py @@ -25,20 +25,11 @@ from spack import * -class OctaveSplines(Package): +class OctaveSplines(OctavePackage): """Additional spline functions.""" homepage = "http://octave.sourceforge.net/splines/index.html" url = "http://downloads.sourceforge.net/octave/splines-1.3.1.tar.gz" version('1.3.1', 'f9665d780c37aa6a6e17d1f424c49bdeedb89d1192319a4e39c08784122d18f9') - extends('octave@3.6.0:') - - def install(self, spec, prefix): - octave('--quiet', - '--norc', - '--built-in-docstrings-file=/dev/null', - '--texi-macros-file=/dev/null', - '--eval', 'pkg prefix %s; pkg install %s' % - (prefix, self.stage.archive_file)) diff --git a/var/spack/repos/builtin/packages/octave-struct/package.py b/var/spack/repos/builtin/packages/octave-struct/package.py index 8a342507aa..0af7f572fd 100644 --- a/var/spack/repos/builtin/packages/octave-struct/package.py +++ b/var/spack/repos/builtin/packages/octave-struct/package.py @@ -23,26 +23,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os -class OctaveStruct(Package): +class OctaveStruct(OctavePackage): """Additional structure manipulation functions for Octave.""" homepage = "https://octave.sourceforge.io/struct/" url = "https://downloads.sourceforge.net/octave/struct-1.0.14.tar.gz" version('1.0.14', '3589d5eb8000f18426e2178587eb82f4') - extends('octave@2.9.7:') - - def install(self, spec, prefix): - os.environ.pop('CC', '') - os.environ.pop('CXX', '') - os.environ.pop('FC', '') - octave('--quiet', - '--norc', - '--built-in-docstrings-file=/dev/null', - '--texi-macros-file=/dev/null', - '--eval', 'pkg prefix %s; pkg install %s' % - (prefix, self.stage.archive_file)) |