From 73fe3ce158c11ab8b9dee08c652121a16b4cbb2a Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Fri, 14 Aug 2020 09:05:30 -0500
Subject: [PATCH] M4: add spack external find support (#16693)
---
var/spack/repos/builtin/packages/m4/package.py | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py
index daf89aed16..5ce6bfd0cc 100644
--- a/var/spack/repos/builtin/packages/m4/package.py
+++ b/var/spack/repos/builtin/packages/m4/package.py
@@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-from spack import *
+import re
class M4(AutotoolsPackage, GNUMirrorPackage):
@@ -32,6 +32,18 @@ class M4(AutotoolsPackage, GNUMirrorPackage):
build_directory = 'spack-build'
+ executables = ['^g?m4$']
+
+ @classmethod
+ def determine_version(cls, exe):
+ # Output on macOS:
+ # GNU M4 1.4.6
+ # Output on Linux:
+ # m4 (GNU M4) 1.4.18
+ output = Executable(exe)('--version', output=str, error=str)
+ match = re.search(r'GNU M4\)?\s+(\S+)', output)
+ return match.group(1) if match else None
+
def configure_args(self):
spec = self.spec
args = ['--enable-c++']
--
GitLab