From 2ca049e74adf772845cc6215cbffdd6a77e103bc Mon Sep 17 00:00:00 2001 From: Annop Wongwathanarat Date: Fri, 21 Apr 2023 13:10:03 +0100 Subject: [PATCH] armpl-gcc: fix PKG_CONFIG_PATH for 23.04 (#37001) --- var/spack/repos/builtin/packages/armpl-gcc/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/armpl-gcc/package.py b/var/spack/repos/builtin/packages/armpl-gcc/package.py index 45c122ee19..c141998a26 100644 --- a/var/spack/repos/builtin/packages/armpl-gcc/package.py +++ b/var/spack/repos/builtin/packages/armpl-gcc/package.py @@ -350,7 +350,9 @@ def make_pkgconfig_files(self): symlink(f, f + ".pc") def setup_dependent_build_environment(self, env, dependent_spec): + armpl_dir = get_armpl_prefix(self.spec) if self.spec.satisfies("@:22"): # pkgconfig directory is not in standard ("lib", "lib64", "share") location - armpl_dir = get_armpl_prefix(self.spec) env.append_path("PKG_CONFIG_PATH", join_path(armpl_dir, "pkgconfig")) + else: + env.append_path("PKG_CONFIG_PATH", join_path(armpl_dir, "lib/pkgconfig"))