summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorNakano Masaki <namachan10777@gmail.com>2023-10-24 05:02:15 +0900
committerGitHub <noreply@github.com>2023-10-23 13:02:15 -0700
commit88622d512985487c527b911603d29a55414abf50 (patch)
treea8306787dd01ea67ed087f8dbc63732a152b34e2 /var
parentd0982115b3c7e0804cba1b3420532be1f36bbc19 (diff)
downloadspack-88622d512985487c527b911603d29a55414abf50.tar.gz
spack-88622d512985487c527b911603d29a55414abf50.tar.bz2
spack-88622d512985487c527b911603d29a55414abf50.tar.xz
spack-88622d512985487c527b911603d29a55414abf50.zip
fix installation error of bear (#40637)
Co-authored-by: Tom Scogland <scogland1@llnl.gov>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/bear/package.py6
-rw-r--r--var/spack/repos/builtin/packages/grpc/package.py2
-rw-r--r--var/spack/repos/builtin/packages/re2/package.py5
3 files changed, 9 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/bear/package.py b/var/spack/repos/builtin/packages/bear/package.py
index 18240c7f33..becb364a2c 100644
--- a/var/spack/repos/builtin/packages/bear/package.py
+++ b/var/spack/repos/builtin/packages/bear/package.py
@@ -23,10 +23,10 @@ class Bear(CMakePackage):
version("2.0.4", sha256="33ea117b09068aa2cd59c0f0f7535ad82c5ee473133779f1cc20f6f99793a63e")
depends_on("pkgconfig", when="@3:")
- depends_on("fmt", when="@3.0.0:")
- depends_on("grpc", when="@3.0.0:")
+ depends_on("fmt@8", when="@3.0.0:")
+ depends_on("grpc +shared", when="@3.0.0:")
depends_on("nlohmann-json", when="@3.0.0:")
- depends_on("spdlog", when="@3.0.0:")
+ depends_on("spdlog +fmt_external", when="@3.0.0:")
depends_on("cmake@2.8:", type="build")
depends_on("python", type="build")
depends_on("googletest", type="test", when="@3:")
diff --git a/var/spack/repos/builtin/packages/grpc/package.py b/var/spack/repos/builtin/packages/grpc/package.py
index dd7f3f5acf..58e64427ec 100644
--- a/var/spack/repos/builtin/packages/grpc/package.py
+++ b/var/spack/repos/builtin/packages/grpc/package.py
@@ -59,7 +59,7 @@ class Grpc(CMakePackage):
depends_on("zlib-api")
depends_on("c-ares")
depends_on("abseil-cpp", when="@1.27:")
- depends_on("re2+pic", when="@1.33.1:")
+ depends_on("re2+pic@2023-09-01", when="@1.33.1:")
def cmake_args(self):
args = [
diff --git a/var/spack/repos/builtin/packages/re2/package.py b/var/spack/repos/builtin/packages/re2/package.py
index 761005949b..3c62d3da76 100644
--- a/var/spack/repos/builtin/packages/re2/package.py
+++ b/var/spack/repos/builtin/packages/re2/package.py
@@ -14,6 +14,9 @@ class Re2(CMakePackage):
url = "https://github.com/google/re2/archive/2020-08-01.tar.gz"
version(
+ "2023-09-01", sha256="5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b"
+ )
+ version(
"2021-06-01", sha256="26155e050b10b5969e986dab35654247a3b1b295e0532880b5a9c13c0a700ceb"
)
version(
@@ -26,6 +29,8 @@ class Re2(CMakePackage):
variant("shared", default=False, description="Build shared instead of static libraries")
variant("pic", default=True, description="Enable position independent code")
+ depends_on("abseil-cpp", when="@2023-09-01:")
+
# shared libs must have position-independent code
conflicts("+shared ~pic")