From 6cf32110b912056201d5a901ee2e99979dc601bf Mon Sep 17 00:00:00 2001 From: Stephen Sachs Date: Wed, 18 Jan 2023 16:57:55 +0100 Subject: [armpl-gcc] Make pkg-config files available (#34978) * [armpl-gcc] Make pkg-config files available ARMpl pkgconfig files are located in a non-default location and do not have the .pc extension. Changing those both helps pkgconfig pick them up correctly, e.g. in the meson build of `py-scipy`. * Address @annop-w comments * symlink instead of cp. Co-authored-by: Stephen Sachs --- var/spack/repos/builtin/packages/armpl-gcc/package.py | 13 ++++++++++++- 1 file changed, 12 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 d3e9097251..6532643ad2 100644 --- a/var/spack/repos/builtin/packages/armpl-gcc/package.py +++ b/var/spack/repos/builtin/packages/armpl-gcc/package.py @@ -17,7 +17,6 @@ _os_map = { "amzn2": "RHEL-7", } - _versions = { "22.1_gcc-11.2": { "RHEL-7": ("9ce7858525109cca8f4e1d533113b6410d55f10cc4db16c4742562da87a32f2b"), @@ -262,3 +261,15 @@ class ArmplGcc(Package): make("-C", armpl_example_dir, "ARMPL_DIR=" + armpl_dir) # clean up make("-C", armpl_example_dir, "ARMPL_DIR=" + armpl_dir, "clean") + + @run_after("install") + def make_pkgconfig_files(self): + # ArmPL pkgconfig files do not have .pc extension and are thus not found by pkg-config + armpl_dir = get_armpl_prefix(self.spec) + for f in find(join_path(armpl_dir, "pkgconfig"), "*"): + symlink(f, f + ".pc") + + def setup_dependent_build_environment(self, env, dependent_spec): + # 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")) -- cgit v1.2.3-70-g09d2