Merge remote branch 'origin/develop' into develop

var/spack/repos/builtin/packages/catch/package.py

@@ -31,6 +31,16 @@ class Catch(Package):
     homepage = "https://github.com/philsquared/Catch"
     url = "https://github.com/philsquared/Catch/archive/v1.3.0.tar.gz"
 
+    version('1.9.4', '110b9173d7f766487fed5b710836c7216a781568')
+    version('1.9.3', 'dc0cd0b344d8ccb1190ac3447efcb49c9b43d497')
+    version('1.9.2', '0580f57edd2b33ec671488dc7b6151f9e360c8c9')
+    version('1.9.1', '10784fc4c3786dfc3bd222fb3f9b048b6d68f186')
+    version('1.9.0', '62f07506d4a381d1730d494b71cff0396b9eb3d6')
+    version('1.8.2', '45a7598a8e5c47bc09fb73eec205ffe0885983dc')
+    version('1.8.1', 'd4e302f712fb7e75ce6f05b436dbaf21dca40030')
+    version('1.8.0', '26064092b5682c9c997b04015ed1565f0e198827')
+    version('1.7.2', '13018db2f0f0395456f695b0d0fbc490662e3467')
+    version('1.7.1', 'f82e11a5cdfef2d36b5687ff5970d383f9e76490')
     version('1.7.0', 'fe39f5b3eb07a5dd0e3f84a1335ceca7de8982e6')
     version('1.6.1', '7d46961a3131655b986123f8a1f439a04a0af623')
     version('1.6.0', '890a3b21085d796e13c3bfaf4b6c6f1d06e4a52e')

var/spack/repos/builtin/packages/cmocka/package.py

@@ -28,8 +28,10 @@
 class Cmocka(Package):
     """Unit-testing framework in pure C"""
     homepage = "https://cmocka.org/"
-    url      = "https://cmocka.org/files/1.0/cmocka-1.0.1.tar.xz"
+    url      = "https://cmocka.org/files/1.1/cmocka-1.1.1.tar.xz"
 
+    version('1.1.1', '6fbff4e42589566eda558db98b97623e')
+    version('1.1.0', '59c9aa5735d9387fb591925ec53523ec')
     version('1.0.1', 'ed861e501a21a92b2af63e466df2015e')
     parallel = False
 

var/spack/repos/builtin/packages/gcc/package.py

@@ -83,6 +83,7 @@ class Gcc(AutotoolsPackage):
     depends_on('gnat', when='languages=ada')
     depends_on('binutils~libiberty', when='+binutils')
     depends_on('zip', type='build', when='languages=java')
+    depends_on('zip', type='build', when='@:6 languages=all')
 
     # TODO: integrate these libraries.
     # depends_on('ppl')

var/spack/repos/builtin/packages/isaac-server/package.py

@@ -31,7 +31,9 @@ class IsaacServer(CMakePackage):
     homepage = "http://computationalradiationphysics.github.io/isaac/"
     url      = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz"
 
-    root_cmakelists_dir = 'server'
+    @property
+    def root_cmakelists_dir(self):
+        return join_path(self.stage.source_path, 'server')
 
     version('develop', branch='dev',
             git='https://github.com/ComputationalRadiationPhysics/isaac.git')

var/spack/repos/builtin/packages/isaac/package.py

@@ -31,7 +31,9 @@ class Isaac(CMakePackage):
     homepage = "http://computationalradiationphysics.github.io/isaac/"
     url      = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz"
 
-    root_cmakelists_dir = 'lib'
+    @property
+    def root_cmakelists_dir(self):
+        return join_path(self.stage.source_path, 'lib')
 
     version('develop', branch='dev',
             git='https://github.com/ComputationalRadiationPhysics/isaac.git')

var/spack/repos/builtin/packages/mariadb/package.py

@@ -33,8 +33,11 @@ class Mariadb(Package):
     tools make it very versatile for a wide variety of use cases."""
 
     homepage = "https://mariadb.org/about/"
-    url      = "https://downloads.mariadb.org/f/mariadb-10.1.14/source/mariadb-10.1.14.tar.gz"
+    url      = "https://downloads.mariadb.org/f/mariadb-10.1.23/source/mariadb-10.1.23.tar.gz"
 
+    version('10.1.23', '1a7392cc05c7c249acd4495022719ca8')
+    version('5.5.56', '8bc7772fea3e11b0bc1a09d2278e2e32')
+    # old versions, do not fetch under given url anymore
     version('10.1.14', '294925531e0fd2f0461e3894496a5adc')
     version('5.5.49', '67b5a499a5f158b2a586e6e3bfb4f304')
 

var/spack/repos/builtin/packages/openssl/package.py

@@ -25,6 +25,7 @@
 import llnl.util.tty as tty
 
 from spack import *
+import spack.architecture
 
 
 class Openssl(Package):
@@ -85,6 +86,10 @@ def install(self, spec, prefix):
         options = ['zlib', 'shared']
         if spec.satisfies('@1.0'):
             options.append('no-krb5')
+        # clang does not support the .arch directive in assembly files.
+        if 'clang' in self.compiler.cc and \
+           'aarch64' in spack.architecture.sys_type():
+            options.append('no-asm')
 
         config = Executable('./config')
         config('--prefix=%s' % prefix,

var/spack/repos/builtin/packages/py-entrypoints/package.py

@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
+from spack.package import PackageBase
 
 
 class PyEntrypoints(PythonPackage):
@@ -45,3 +46,8 @@ class PyEntrypoints(PythonPackage):
     def install(self, spec, prefix):
         pip = which('pip')
         pip('install', self.stage.archive_file, '--prefix={0}'.format(prefix))
+
+    run_after('install')(PackageBase._run_default_install_time_test_callbacks)
+
+    # Check that self.prefix is there after installation
+    run_after('install')(PackageBase.sanity_check_prefix)