Merge branch 'develop' into develop

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

@@ -100,6 +100,7 @@ class Edm4hep(CMakePackage):
     )
 
     depends_on("[email protected]:", type="build")
+    depends_on("[email protected]:", type="build", when="@0.10.3:")
     depends_on("python", type="build")
 
     depends_on("[email protected]:")

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

@@ -19,6 +19,7 @@ class Lcio(CMakePackage):
     maintainers("gaede", "vvolkl", "jmcarcell")
 
     version("master", branch="master")
+    version("2.20.2", sha256="b37cee344c28ccddc590e5317721b375ef19f4392ae067bc86583107acaf2374")
     version("2.20.1", sha256="125f657297de12b40694cb0dddec1d1ce3379058492f2a6a2a6f992ee51604d6")
     version("2.20", sha256="5ef92c9ef04ce468ffb48be0ec6010377a400b064e352cb50f9f4c9599e7e990")
     version("2.19", sha256="2d6b37094d8d556ab0ba0efa632f10d8b851f533ca5c767e436397df18cb57c7")

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

@@ -308,14 +308,14 @@ class Llvm(CMakePackage, CudaPackage):
         depends_on("swig", when="+python")
         depends_on("xz")
 
-    # Use ^swig cause it's triggered by both python & lua scripting in lldb
-    with when("^swig"):
-        depends_on("swig@2:", when="@10:")
-        depends_on("swig@3:", when="@12:")
-        depends_on("swig@4:", when="@17:")
-        # Commits f0a25fe0b746f56295d5c02116ba28d2f965c175 and
-        # 81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63 fixed swig 4.1 support
-        depends_on("swig@:4.0", when="@:15")
+    for _when_spec in ("+lldb+python", "+lldb+lua"):
+        with when(_when_spec):
+            depends_on("swig@2:", when="@10:")
+            depends_on("swig@3:", when="@12:")
+            depends_on("swig@4:", when="@17:")
+            # Commits f0a25fe0b746f56295d5c02116ba28d2f965c175 and
+            # 81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63 fixed swig 4.1 support
+            depends_on("swig@:4.0", when="@:15")
 
     # gold support, required for some features
     depends_on("binutils+gold+ld+plugins+headers", when="+gold")

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

@@ -19,6 +19,7 @@ class Sio(CMakePackage):
     maintainers("vvolkl", "tmadlener", "jmcarcell")
 
     version("master", branch="master")
+    version("0.2", sha256="416c93402e7314b7aadedba8e7f9e0d4b0b4f4e34ce26285b04cebb505ecfab2")
     version("0.1", sha256="0407c0daeae53660c0562f9302a220f72ab51547050cd9fe9113b995804ab4b4")
     version("0.0.4", sha256="72e96e6a1cc8dd3641d3e2bb9876e75bf6af8074e1617220da9e52df522ef5c0")
     version("0.0.3", sha256="4c8b9c08480fb53cd10abb0e1260071a8c3f68d06a8acfd373f6560a916155cc")

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

@@ -0,0 +1,46 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class Yosys(MakefilePackage):
+    """Yosys is a framework for RTL synthesis tools. It currently has extensive
+    Verilog-2005 support and provides a basic set of synthesis algorithms for
+    various application domains.
+
+    Yosys can be adapted to perform any synthesis job by combining the existing
+    passes (algorithms) using synthesis scripts and adding additional passes
+    as needed by extending the yosys C++ code base.
+
+    Yosys is free software licensed under the ISC license (a GPL compatible
+    license that is similar in terms to the MIT license or the 2-clause BSD license).
+    """
+
+    homepage = "https://yosyshq.net/yosys"
+    url = "https://github.com/YosysHQ/yosys/archive/refs/tags/yosys-0.35.tar.gz"
+    git = "https://github.com/YosysHQ/yosys.git"
+
+    maintainers("davekeeshan")
+
+    version("master", branch="master")
+
+    version("0.35", sha256="a00643cf4cf83701bfa2b358066eb9d360393d30e8f5a8e65f619ab1fd10474a")
+    version("0.34", sha256="57897bc3fe5fdc940e9f3f3ae03b84f5f8e9149b6f26d3699f7ecb9f31a41ae0")
+
+    depends_on("automake", type="build")
+    depends_on("readline")
+    depends_on("pkg-config")
+    depends_on("tcl")
+    depends_on("zlib")
+    depends_on("llvm")
+
+    def setup_build_environment(self, env):
+        env.set("PREFIX", self.prefix)
+        env.set("CXXFLAGS", f'-I{self.spec["readline"].prefix.include}')
+        env.set(
+            "LDFLAGS", f'-L{self.spec["readline"].prefix.lib} -L{self.spec["zlib"].prefix.lib}'
+        )
+        env.set("ABC_READLINE_INCLUDES", f'-I{self.spec["readline"].prefix.include}')