From aca370a3a2dc35dc5ccc8410dab3f91743715d14 Mon Sep 17 00:00:00 2001 From: Robert Blake Date: Fri, 28 Aug 2020 14:22:05 -0700 Subject: External recognition for find. (#18360) * External recognition for find. * Adding re package. --- var/spack/repos/builtin/packages/findutils/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index f4a36dbb46..56a60c85b8 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * +import re class Findutils(AutotoolsPackage, GNUMirrorPackage): @@ -13,6 +14,8 @@ class Findutils(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/findutils/" gnu_mirror_path = "findutils/findutils-4.6.0.tar.gz" + executables = ['^find$'] + version('4.6.0', sha256='ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d') version('4.4.2', sha256='434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a') version('4.4.1', sha256='77a5b85d7fe0dd9c1093e010b61f765707364ec2c89c4f432c1c616215bcc138') @@ -45,6 +48,12 @@ class Findutils(AutotoolsPackage, GNUMirrorPackage): build_directory = 'spack-build' + @classmethod + def determine_version(cls, exe): + output = Executable(exe)('--version', output=str, error=str) + match = re.search(r'find \(GNU findutils\)\s+(\S+)', output) + return match.group(1) if match else None + @property def force_autoreconf(self): # Run autoreconf due to build system patch (gnulib-makedev) -- cgit v1.2.3-70-g09d2