pkgconfig: add spack external find support (#16690)

2 files changed, 28 insertions, 0 deletions

diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py
index bdbf1b5d3d..d4def51e21 100644
--- a/var/spack/repos/builtin/packages/pkg-config/package.py
+++ b/var/spack/repos/builtin/packages/pkg-config/package.py
@@ -27,6 +27,20 @@ class PkgConfig(AutotoolsPackage):
 
     parallel = False
 
+    executables = ['^pkg-config$']
+
+    @classmethod
+    def determine_version(cls, exe):
+        exe = Executable(exe)
+
+        # Make sure this is actually pkg-config, not pkgconf
+        if 'usage: pkgconf' in exe('--help', output=str, error=str):
+            return None
+
+        version = exe('--version', output=str, error=str).rstrip()
+
+        return version
+
     def setup_dependent_build_environment(self, env, dependent_spec):
         """Adds the ACLOCAL path for autotools."""
         env.append_path('ACLOCAL_PATH', self.prefix.share.aclocal)
diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py
index 3bb59b4dd8..2d3af9bdc5 100644
--- a/var/spack/repos/builtin/packages/pkgconf/package.py
+++ b/var/spack/repos/builtin/packages/pkgconf/package.py
@@ -31,6 +31,20 @@ class Pkgconf(AutotoolsPackage):
     # TODO: Add a package for the kyua testing framework
     # depends_on('kyua', type='test')
 
+    executables = ['^pkgconf$', '^pkg-config$']
+
+    @classmethod
+    def determine_version(cls, exe):
+        exe = Executable(exe)
+
+        # Make sure this is actually pkgconf, not pkg-config
+        if 'usage: pkgconf' not in exe('--help', output=str, error=str):
+            return None
+
+        version = exe('--version', output=str, error=str).rstrip()
+
+        return version
+
     def setup_dependent_build_environment(self, env, dependent_spec):
         """Adds the ACLOCAL path for autotools."""
         env.append_path('ACLOCAL_PATH', self.prefix.share.aclocal)