diff options
| author | Alex Richert <alexrichert@users.noreply.github.com> | 2024-05-12 10:44:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-12 10:44:31 -0700 |
| commit | cff35c498705e1bc217cb433fc234c2f55910577 (patch) | |
| tree | 61685d2e7ebf333e28c18e01e15b1e6c97fd96b3 /var | |
| parent | d594f84b8fd4b67c411de28db7b024d8c319411c (diff) | |
| download | spack-cff35c498705e1bc217cb433fc234c2f55910577.tar.gz spack-cff35c498705e1bc217cb433fc234c2f55910577.tar.bz2 spack-cff35c498705e1bc217cb433fc234c2f55910577.tar.xz spack-cff35c498705e1bc217cb433fc234c2f55910577.zip | |
octave: use pcre2 for @8: (#42636)
* octave: use pcre2 for @8:
* Add 'pcre2' variant to octave to control pcre vs. pcre2
* Update var/spack/repos/builtin/packages/octave/package.py
Co-authored-by: Alec Scott <hi@alecbcs.com>
---------
Co-authored-by: Alex Richert <alexander.richert@noaa.gov>
Co-authored-by: Alec Scott <hi@alecbcs.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/octave/package.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 0eb3610627..8a79392c52 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -72,6 +72,7 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): variant("jdk", default=False, description="Use Java") variant("llvm", default=False, description="Use LLVM") variant("opengl", default=False, description="Use OpenGL") + variant("pcre2", default=True, when="@8:", description="Use PCRE2 instead of PCRE") variant("qhull", default=False, description="Use qhull") variant("qrupdate", default=False, description="Use qrupdate") variant("qscintilla", default=False, description="Use QScintill") @@ -84,7 +85,9 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): depends_on("lapack") # Octave does not configure with sed from darwin: depends_on("sed", when=sys.platform == "darwin", type="build") - depends_on("pcre") + depends_on("pcre", when="@:7") + depends_on("pcre", when="~pcre2") + depends_on("pcre2", when="+pcre2") depends_on("pkgconfig", type="build") depends_on("texinfo", type="build") @@ -350,6 +353,8 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): else: config_args.append("--without-z") + if spec.satisfies("~pcre2"): + config_args.append("--without-pcre2") # If 64-bit BLAS is used: if ( spec.satisfies("^openblas+ilp64") |