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

spack external find grep on Linux AND macOS (#48134)

Browse Source 
* Configure 'spack external find grep'
* Fix style for finding external grep
* Remove unused 're' Python module from grep
This commit is contained in:
Dom Heinzeller 2024-12-18 21:02:20 -07:00 committed by GitHub
parent 83af81a14a
commit 918afd6385
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/grep/package.py
View File

@ -2,7 +2,6 @@
# Spack Project Developers. See the top-level COPYRIGHT file for details. # Spack Project Developers. See the top-level COPYRIGHT file for details.
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import re
from spack.package import * from spack.package import *
@ -16,8 +15,6 @@ class Grep(AutotoolsPackage):
license("GPL-3.0-or-later") license("GPL-3.0-or-later")
executables = ["^grep$"]
version("3.11", sha256="1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab") version("3.11", sha256="1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab")
version("3.10", sha256="24efa5b595fb5a7100879b51b8868a0bb87a71c183d02c4c602633b88af6855b") version("3.10", sha256="24efa5b595fb5a7100879b51b8868a0bb87a71c183d02c4c602633b88af6855b")
version("3.9", sha256="abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599") version("3.9", sha256="abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599")
@ -33,13 +30,23 @@ class Grep(AutotoolsPackage):
depends_on("pcre2", when="@3.8:+pcre") depends_on("pcre2", when="@3.8:+pcre")
depends_on("pcre", when="@:3.7+pcre") depends_on("pcre", when="@:3.7+pcre")
# For spack external find
executables = ["^grep$"]
@classmethod @classmethod
def determine_version(cls, exe): def determine_version(cls, exe):
output = Executable(exe)("--version", output=str, error=str) version_string = Executable(exe)("--version", output=str, error=str).split("\n")[0]
# Example output: # Linux
# grep (GNU grep) 3.11 if "GNU grep" in version_string:
match = re.search(r"^grep \(GNU grep\) ([0-9.]+)", output) return version_string.lstrip("grep (GNU grep)").strip()
return match.group(1) if match else None # macOS
elif "BSD grep, GNU compatible" in version_string:
return (
version_string.lstrip("grep (BSD grep, GNU compatible)").rstrip("-FreeBSD").strip()
)
# Don't know how to handle this version of grep, don't add it
else:
return None
def configure_args(self): def configure_args(self):
args = [] args = []