Merge pull request #205 from FNALssi/larsoft_fixes_vs_fnal_develop

tweaks from larsoft build

bin/spack

@@ -1,3 +1,4 @@
+#!/usr/bin/python3 -I
 #!/bin/sh
 # -*- python -*-
 #

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

@@ -17,6 +17,7 @@ class Catch2(CMakePackage):
     maintainers("ax3l", "greenc-FNAL")
 
     # In-Development
+
     version("develop", branch="devel")
 
     # Releases

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

@@ -25,6 +25,7 @@ class Grpc(CMakePackage):
     version("1.37.0", sha256="c2dc8e876ea12052d6dd16704492fd8921df8c6d38c70c4708da332cf116df22")
     version("1.36.4", sha256="8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a")
     version("1.36.3", sha256="bb6de0544adddd54662ba1c314eff974e84c955c39204a4a2b733ccd990354b7")
+    version("1.35.0", sha256="27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958")
     version("1.33.1", sha256="58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63")
     version("1.32.0", sha256="f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a")
     version("1.31.0", sha256="1236514199d3deb111a6dd7f6092f67617cd2b147f7eda7adbafccea95de7381")

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

@@ -55,5 +55,6 @@ def cmake_args(self):
             "-DHIGHFIVE_PARALLEL_HDF5:Bool={0}".format("+mpi" in self.spec),
             "-DHIGHFIVE_UNIT_TESTS:Bool=false",
             "-DHIGHFIVE_EXAMPLES:Bool=false",
+            "-DHDF5_ROOT:String={0}".format(self.spec["hdf5"].prefix),
         ]
         return args

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

@@ -137,6 +137,14 @@ class Mysql(CMakePackage):
 
     patch("fix-no-server-5.5.patch", level=1, when="@5.5.0:5.5")
     patch("old_ssl_fix.patch", when="@8.0.29")
+    patch("missing_include.patch",  when="@8:")
+
+    def patch(self):
+        filter_file(
+           r"IF\(NOT BOOST_MINOR_VERSION EQUAL",
+           "IF(NOT BOOST_MINOR_VERSION GREATER_EQUAL",
+           "cmake/boost.cmake",
+        )
 
     @property
     def command(self):
@@ -158,6 +166,9 @@ def cmake_args(self):
         if "+client_only" in self.spec:
             options.append("-DWITHOUT_SERVER:BOOL=ON")
         options.append("-DWITH_EDITLINE=system")
+        options.append("-DWITH_LZ4=system")
+        options.append("-DWITH_ZLIB=system")
+        options.append("-DWITH_ZSTD=system")
         options.append("-Dlibedit_INCLUDE_DIR={0}".format(spec["libedit"].prefix.include))
         options.append("-Dlibedit_LIBRARY={0}".format(spec["libedit"].libs.directories[0]))
         return options

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

@@ -20,6 +20,9 @@ class Oniguruma(AutotoolsPackage):
     def libs(self):
         return find_libraries("libonig", root=self.prefix, recursive=True)
 
+    def configure_args(self):
+        return ['--enable-posix-api']
+
     @run_after("install")
     @on_package_attributes(run_tests=True)
     def configuration_check(self):

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

@@ -36,6 +36,7 @@ class Protobuf(CMakePackage):
     version("3.17.3", sha256="c6003e1d2e7fefa78a3039f19f383b4f3a61e81be8c19356f85b6461998ad3db")
     version("3.17.0", sha256="eaba1dd133ac5167e8b08bc3268b2d33c6e9f2dcb14ec0f97f3d3eed9b395863")
     version("3.16.0", sha256="7892a35d979304a404400a101c46ce90e85ec9e2a766a86041bb361f626247f5")
+    version("3.15.8", sha256="0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441")
     version("3.15.7", sha256="efdd6b932a2c0a88a90c4c80f88e4b2e1bf031e7514dbb5a5db5d0bf4f295504")
     version("3.15.5", sha256="bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b")
     version("3.15.4", sha256="07f8a02afc14a657f727ed89a8ec5627b9ecc47116d60acaabaa1da233bd2e8f")
@@ -129,6 +130,8 @@ def cmake_args(self):
             self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
             self.define("protobuf_BUILD_TESTS", False),
             self.define("CMAKE_POSITION_INDEPENDENT_CODE", True),
+            self.define("protobuf_BUILD_SHARED_LIBS", True),
+            self.define("CMAKE_INSTALL_LIBDIR", "lib"),
         ]
 
         if self.spec.satisfies("@3.22:"):
@@ -140,6 +143,12 @@ def cmake_args(self):
                 ]
             )
 
+            if not cxxstd == 14 and self.compiler.name == "clang":
+                args.extend( [
+                    "-DCMAKE_CXX_FLAGS=-std=c++{0} -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES=1".format(cxxstd),
+                  ]
+                )
+
         if self.spec.satisfies("platform=darwin"):
             args.append(self.define("CMAKE_MACOSX_RPATH", True))
 

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

@@ -12,6 +12,8 @@ class PyGrpcio(PythonPackage):
     homepage = "https://grpc.io/"
     pypi = "grpcio/grpcio-1.32.0.tar.gz"
 
+    version("1.59.0", sha256="acf70a63cf09dd494000007b798aff88a436e1c03b394995ce450be437b8e54f")
+    version("1.58.0", sha256="532410c51ccd851b706d1fbc00a87be0f5312bd6f8e5dbf89d4e99c7f79d7499")
     version("1.52.0", sha256="a5d4a83d29fc39af429c10b9b326c174fec49b73398e4a966a1f2a4f30aa4fdb")
     version("1.48.1", sha256="660217eccd2943bf23ea9a36e2a292024305aec04bf747fbcff1f5032b83610e")
     version("1.43.0", sha256="735d9a437c262ab039d02defddcb9f8f545d7009ae61c0114e19dda3843febe5")
@@ -55,8 +57,9 @@ def setup_build_environment(self, env):
 
         for dep in self.spec.dependencies(deptype="link"):
             query = self.spec[dep.name]
-            env.prepend_path("LIBRARY_PATH", query.libs.directories[0])
-            env.prepend_path("CPATH", query.headers.directories[0])
+            if query.libs.directories:
+                env.prepend_path("LIBRARY_PATH", query.libs.directories[0])
+                env.prepend_path("CPATH", query.headers.directories[0])
 
     def patch(self):
         filter_file("-std=gnu99", "", "setup.py")

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

@@ -94,7 +94,7 @@ class Pythia8(AutotoolsPackage):
     depends_on("openmpi", when="+openmpi")
     depends_on("mpich", when="+mpich")
     depends_on("hdf5", when="+hdf5")
-    depends_on("[email protected]", when="+hdf5")
+    depends_on("[email protected]:", when="+hdf5")
 
     extends("python", when="+python")
 

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

@@ -29,6 +29,7 @@ class Root(CMakePackage):
     # ###################### Versions ##########################
 
     # Master branch
+
     version("master", branch="master")
 
     # Development version (when more recent than production).

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

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 import re
+import os
 
 from spack.package import *
 
@@ -144,6 +145,12 @@ def configure(self, spec, prefix):
 
         configure(*flags)
 
+    def setup_build_environment(self, env):
+        env.set(
+            "CARGO_HOME",
+            os.path.join(os.path.dirname(self.stage.path), ".cargo")
+        )
+
     def build(self, spec, prefix):
         python("./x.py", "build")
 

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

@@ -24,6 +24,7 @@ class Xrootd(CMakePackage):
     version("5.5.3", sha256="703829c2460204bd3c7ba8eaa23911c3c9a310f6d436211ba0af487ef7f6a980")
     version("5.5.2", sha256="ec4e0490b8ee6a3254a4ea4449342aa364bc95b78dc9a8669151be30353863c6")
     version("5.5.1", sha256="3556d5afcae20ed9a12c89229d515492f6c6f94f829a3d537f5880fcd2fa77e4")
+    version("5.4.3", sha256="2d58210161ef61fabad7c86a038f2ef71c2ba1a0e782fcb6b8c92a1ba5f2a2b3")
     version("5.3.2", sha256="e8371fb9e86769bece74b9b9d67cb695023cd6a20a1199386fddd9ed840b0875")
     version("5.3.1", sha256="7ea3a112ae9d8915eb3a06616141e5a0ee366ce9a5e4d92407b846b37704ee98")
     version("5.1.0", sha256="c639536f1bdc5b6b365e807f3337ed2d41012cd3df608d40e91ed05f1c568b6d")