diff options
Diffstat (limited to 'var')
7 files changed, 56 insertions, 24 deletions
diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 43892465db..555fbb91f7 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -36,7 +36,7 @@ class Fftw(AutotoolsPackage): homepage = "http://www.fftw.org" url = "http://www.fftw.org/fftw-3.3.4.tar.gz" - version('3.3.6-pl1', '682a0e78d6966ca37c7446d4ab4cc2a1') + version('3.3.6-pl2', '927e481edbb32575397eb3d62535a856') version('3.3.5', '6cc08a3b9c7ee06fdd5b9eb02e06f569') version('3.3.4', '2edab8c06b24feeb3b82bbb3ebf3e7b3') version('2.1.5', '8d16a84f3ca02a785ef9eb36249ba433') diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 638ef7e30c..06d784c8e0 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -39,4 +39,8 @@ class Gnutls(AutotoolsPackage): version('3.3.9', 'ff61b77e39d09f1140ab5a9cf52c58b6') - depends_on("nettle") + # configure sez: Note that this version of gnutls doesn't support + # nettle 3.0. + depends_on("nettle@:2.9") + + build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 15f7f4f987..15bdbbc4d1 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -470,19 +470,10 @@ class Python(Package): else: with closing(open(main_pth, 'w')) as f: - f.write(""" -import sys -sys.__plen = len(sys.path) -""") + f.write("import sys; sys.__plen = len(sys.path)") for path in paths: f.write("{0}\n".format(path)) - f.write(""" -new = sys.path[sys.__plen:] -del sys.path[sys.__plen:] -p = getattr(sys, '__egginsert', 0) -sys.path[p:p] = new -sys.__egginsert = p + len(new) -""") + f.write("import sys; new = sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p = getattr(sys, '__egginsert', 0); sys.path[p:p] = new; sys.__egginsert = p + len(new)") # noqa: E501 def activate(self, ext_pkg, **args): ignore = self.python_ignore(ext_pkg, args) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 6d77f28846..60c5f15ece 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -35,6 +35,7 @@ class Qt(Package): list_url = 'http://download.qt.io/archive/qt/' list_depth = 4 + version('5.7.1', '031fb3fd0c3cc0f1082644492683f18d') version('5.7.0', '9a46cce61fc64c20c3ac0a0e0fa41b42') version('5.5.1', '59f0216819152b77536cf660b015d784') version('5.4.2', 'fa1c4d819b401b267eb246a543a63ea5') @@ -46,13 +47,20 @@ class Qt(Package): # Add patch for compile issues with qt3 found with use in the # OpenSpeedShop project - variant('krellpatch', default=False, description="Build with openspeedshop based patch.") - variant('mesa', default=False, description="Depend on mesa.") - variant('gtk', default=False, description="Build with gtkplus.") - variant('webkit', default=False, description="Build the Webkit extension") - variant('examples', default=False, description="Build examples.") - variant('dbus', default=False, description="Build with D-Bus support.") - variant('phonon', default=False, description="Build with phonon support.") + variant('krellpatch', default=False, + description="Build with openspeedshop based patch.") + variant('mesa', default=False, + description="Depend on mesa.") + variant('gtk', default=False, + description="Build with gtkplus.") + variant('webkit', default=False, + description="Build the Webkit extension") + variant('examples', default=False, + description="Build examples.") + variant('dbus', default=False, + description="Build with D-Bus support.") + variant('phonon', default=False, + description="Build with phonon support.") patch('qt3krell.patch', when='@3.3.8b+krellpatch') @@ -77,6 +85,9 @@ class Qt(Package): depends_on("jpeg") depends_on("icu4c") + # QtQml + depends_on("python", when='@5.7.0:', type='build') + # OpenGL hardware acceleration depends_on("mesa", when='@4:+mesa') depends_on("libxcb", when=sys.platform != 'darwin') @@ -176,10 +187,15 @@ class Qt(Package): '-optimized-qmake', '-no-openvg', '-no-pch', - # NIS is deprecated in more recent glibc - '-no-nis' ] + if '@:5.7.0' in self.spec: + config_args.extend([ + # NIS is deprecated in more recent glibc, + # but qt-5.7.1 does not recognize this option + '-no-nis', + ]) + if '~examples' in self.spec: config_args.extend(['-nomake', 'examples']) diff --git a/var/spack/repos/builtin/packages/r-packrat/package.py b/var/spack/repos/builtin/packages/r-packrat/package.py index 726a6640e8..ff66ddaf39 100644 --- a/var/spack/repos/builtin/packages/r-packrat/package.py +++ b/var/spack/repos/builtin/packages/r-packrat/package.py @@ -33,4 +33,5 @@ class RPackrat(RPackage): url = "https://cran.r-project.org/src/contrib/packrat_0.4.7-1.tar.gz" list_url = "https://cran.r-project.org/src/contrib/Archive/packrat" + version('0.4.8-1', '14e82feba55fcda923396282fc490038') version('0.4.7-1', '80c2413269b292ade163a70ba5053e84') diff --git a/var/spack/repos/builtin/packages/scotch/nonthreaded-6.0.4.patch b/var/spack/repos/builtin/packages/scotch/nonthreaded-6.0.4.patch new file mode 100644 index 0000000000..89d17e253e --- /dev/null +++ b/var/spack/repos/builtin/packages/scotch/nonthreaded-6.0.4.patch @@ -0,0 +1,11 @@ +--- scotch_6.0.4.orig/src/libscotch/common.h 2015-03-01 10:14:02.000000000 +0100 ++++ scotch_6.0.4/src/libscotch/common.h 2017-03-27 13:07:18.644221999 +0200 +@@ -306,6 +306,8 @@ + ThreadLaunchStartFunc stafptr; /*+ Pointer to start routine +*/ + ThreadLaunchJoinFunc joifptr; /*+ Pointer to join routine +*/ + ThreadBarrier barrdat; /*+ Barrier data structure +*/ ++#else ++ int thrdnbr; /* dummy for non-threaded */ + #endif /* ((defined COMMON_PTHREAD) || (defined SCOTCH_PTHREAD)) */ + } ThreadGroupHeader; + diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index f164037efa..b878349485 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -31,7 +31,7 @@ class Scotch(Package): partitioning, graph clustering, and sparse matrix ordering.""" homepage = "http://www.labri.fr/perso/pelegrin/scotch/" - url = "http://gforge.inria.fr/frs/download.php/latestfile/298/scotch_6.0.3.tar.gz" + url = "http://gforge.inria.fr/frs/download.php/latestfile/298/scotch_6.0.3.tar.gz" # noqa: E501 base_url = "http://gforge.inria.fr/frs/download.php/latestfile/298" list_url = "http://gforge.inria.fr/frs/?group_id=248" @@ -50,12 +50,17 @@ class Scotch(Package): description='Build a shared version of the library') variant('metis', default=True, description='Build metis and parmetis wrapper libraries') + variant('int64', default=False, + description='Use int64_t for SCOTCH_Num typedef') depends_on('flex@:2.6.1', type='build') depends_on('bison', type='build') depends_on('mpi', when='+mpi') depends_on('zlib', when='+compression') + # Version-specific patches + patch('nonthreaded-6.0.4.patch', when='@6.0.4') + # NOTE: In cross-compiling environment parallel build # produces weird linker errors. parallel = False @@ -87,9 +92,13 @@ class Scotch(Package): '-DCOMMON_RANDOM_FIXED_SEED', '-DSCOTCH_DETERMINISTIC', '-DSCOTCH_RENAME', - '-DIDXSIZE64' + '-DIDXSIZE64', # SCOTCH_Idx typedef: indices for addressing ] + # SCOTCH_Num typedef: size of integers in arguments + if '+int64' in self.spec: + cflags.append('-DINTSIZE64') + if self.spec.satisfies('platform=darwin'): cflags.extend([ '-Drestrict=__restrict' |