zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix installation error of bear (#40637)

Browse Source 
Co-authored-by: Tom Scogland <scogland1@llnl.gov>
This commit is contained in:
Nakano Masaki
2023-10-24 05:02:15 +09:00
committed by GitHub
parent d0982115b3
commit 88622d5129
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/bear/package.py
View File

@@ -23,10 +23,10 @@ class Bear(CMakePackage):
version("2.0.4", sha256="33ea117b09068aa2cd59c0f0f7535ad82c5ee473133779f1cc20f6f99793a63e") version("2.0.4", sha256="33ea117b09068aa2cd59c0f0f7535ad82c5ee473133779f1cc20f6f99793a63e")
depends_on("pkgconfig", when="@3:") depends_on("pkgconfig", when="@3:")
depends_on("fmt", when="@3.0.0:") depends_on("fmt@8", when="@3.0.0:")
depends_on("grpc", when="@3.0.0:") depends_on("grpc +shared", when="@3.0.0:")
depends_on("nlohmann-json", 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("cmake@2.8:", type="build")
depends_on("python", type="build") depends_on("python", type="build")
depends_on("googletest", type="test", when="@3:") depends_on("googletest", type="test", when="@3:")

2
var/spack/repos/builtin/packages/grpc/package.py
View File

@@ -59,7 +59,7 @@ class Grpc(CMakePackage):
depends_on("zlib-api") depends_on("zlib-api")
depends_on("c-ares") depends_on("c-ares")
depends_on("abseil-cpp", when="@1.27:") 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): def cmake_args(self):
args = [ args = [

5
var/spack/repos/builtin/packages/re2/package.py
View File

@@ -13,6 +13,9 @@ class Re2(CMakePackage):
homepage = "https://github.com/google/re2" homepage = "https://github.com/google/re2"
url = "https://github.com/google/re2/archive/2020-08-01.tar.gz" url = "https://github.com/google/re2/archive/2020-08-01.tar.gz"
version(
"2023-09-01", sha256="5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b"
)
version( version(
"2021-06-01", sha256="26155e050b10b5969e986dab35654247a3b1b295e0532880b5a9c13c0a700ceb" "2021-06-01", sha256="26155e050b10b5969e986dab35654247a3b1b295e0532880b5a9c13c0a700ceb"
) )
@@ -26,6 +29,8 @@ class Re2(CMakePackage):
variant("shared", default=False, description="Build shared instead of static libraries") variant("shared", default=False, description="Build shared instead of static libraries")
variant("pic", default=True, description="Enable position independent code") variant("pic", default=True, description="Enable position independent code")
depends_on("abseil-cpp", when="@2023-09-01:")
# shared libs must have position-independent code # shared libs must have position-independent code
conflicts("+shared ~pic") conflicts("+shared ~pic")