mold: unvendor (#44539)

2 files changed, 29 insertions, 6 deletions

diff --git a/var/spack/repos/builtin/packages/blake3/package.py b/var/spack/repos/builtin/packages/blake3/package.py
new file mode 100644
index 0000000000..a27cbc05de
--- /dev/null
+++ b/var/spack/repos/builtin/packages/blake3/package.py
@@ -0,0 +1,21 @@
+# Copyright 2013-2024 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 Blake3(CMakePackage):
+    """BLAKE3 is a cryptographic hash function"""
+
+    homepage = "https://github.com/BLAKE3-team/BLAKE3"
+    url = "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.5.1.tar.gz"
+
+    root_cmakelists_dir = "c"
+
+    maintainers("haampie")
+
+    version("1.5.1", sha256="822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37")
+
+    depends_on("cmake@3.9:", type="build")
diff --git a/var/spack/repos/builtin/packages/mold/package.py b/var/spack/repos/builtin/packages/mold/package.py
index 7545796897..8f410f11cf 100644
--- a/var/spack/repos/builtin/packages/mold/package.py
+++ b/var/spack/repos/builtin/packages/mold/package.py
@@ -27,13 +27,15 @@ class Mold(CMakePackage):
     version("1.11.0", sha256="99318eced81b09a77e4c657011076cc8ec3d4b6867bd324b8677974545bc4d6f")
     version("1.7.1", sha256="fa2558664db79a1e20f09162578632fa856b3cde966fbcb23084c352b827dfa9")
 
+    depends_on("blake3", when="@2.2:")
     depends_on("mimalloc")
-    depends_on("zlib-api")
-    depends_on("openssl")
+    depends_on("openssl", when="@:2.1")
     depends_on("tbb")
+    depends_on("zlib-api")
+    depends_on("zstd")
 
     def cmake_args(self):
-        args = []
-        args.append(self.define("MOLD_USE_SYSTEM_MIMALLOC", True))
-
-        return args
+        return [
+            self.define("MOLD_USE_SYSTEM_MIMALLOC", True),
+            self.define("MOLD_USE_SYSTEM_TBB", True),
+        ]