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

Fix pkgconfig dependencies (#33614)

Browse Source 
Packages should depend on the virtual provider, pkgconfig, not on its implementations pkg-config or pkgconf.
This commit is contained in:
Michael Kuhn 2022-10-31 19:44:07 +01:00 committed by GitHub
parent ef3cd6d6ca
commit fc2d5d2311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/aml/package.py
View File

@ -76,6 +76,7 @@ class Aml(AutotoolsPackage):
depends_on("automake", type="build")
depends_on("libtool", type="build")
# Required to have pkg config macros in configure.
# Note: This does NOT work with pkg-config but requires pkgconf!
depends_on("pkgconf", type="build")
# Required to generate AML version in configure.
depends_on("git", type="build")

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

@ -22,7 +22,7 @@ class Bear(CMakePackage):
version("2.2.0", sha256="6bd61a6d64a24a61eab17e7f2950e688820c72635e1cf7ea8ea7bf9482f3b612")
version("2.0.4", sha256="33ea117b09068aa2cd59c0f0f7535ad82c5ee473133779f1cc20f6f99793a63e")
depends_on("pkgconf", when="@3:")
depends_on("pkgconfig", when="@3:")
depends_on("fmt", when="@3.0.0:")
depends_on("grpc", when="@3.0.0:")
depends_on("nlohmann-json", when="@3.0.0:")

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

@ -212,7 +212,7 @@ class Libpressio(CMakePackage, CudaPackage):
depends_on("lua-sol2", when="+lua")
depends_on("libdistributed@0.0.11:", when="+libdistributed")
depends_on("libdistributed@0.4.0:", when="@0.85.0:+libdistributed")
depends_on("pkg-config", type="build")
depends_on("pkgconfig", type="build")
depends_on("ftk@master", when="+ftk")
depends_on("digitrounding", when="+digitrounding")
depends_on("bitgroomingz", when="+bitgrooming")

2
var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py
View File

@ -21,7 +21,7 @@ class OphidiaAnalyticsFramework(AutotoolsPackage):
depends_on("automake", type="build")
depends_on("libtool", type="build")
depends_on("m4", type="build")
depends_on("pkg-config", type="build")
depends_on("pkgconfig", type="build")
depends_on("gsl")
depends_on("mpich")

2
var/spack/repos/builtin/packages/ophidia-primitives/package.py
View File

@ -21,7 +21,7 @@ class OphidiaPrimitives(AutotoolsPackage):
depends_on("automake", type="build")
depends_on("libtool", type="build")
depends_on("m4", type="build")
depends_on("pkg-config", type="build")
depends_on("pkgconfig", type="build")
depends_on("boost@1.79.0")
depends_on("mysql")

2
var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py
View File

@ -21,7 +21,7 @@ class RiscvGnuToolchain(AutotoolsPackage):
version("2022.08.08", tag="2022.08.08", submodules=True)
# Dependencies:
depends_on("pkg-config", type="build")
depends_on("pkgconfig", type="build")
depends_on("autoconf", when="@main:", type="build")
depends_on("python", type="build")
depends_on("gawk", type="build")

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

@ -18,7 +18,7 @@ class Sperr(CMakePackage):
depends_on("git", type="build")
depends_on("zstd", type=("build", "link"), when="+zstd")
depends_on("pkgconf", type=("build"), when="+zstd")
depends_on("pkgconfig", type=("build"), when="+zstd")
variant("shared", description="build shared libaries", default=True)
variant("zstd", description="use Zstd for more compression", default=True)