From 2e19a9343b15df4a9e690b7b57fb8ce29f1ef56d Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 13 Dec 2019 12:53:44 -0600 Subject: Add latest version of oniguruma (#14133) --- .../repos/builtin/packages/oniguruma/package.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/oniguruma/package.py b/var/spack/repos/builtin/packages/oniguruma/package.py index 9d9ccecdec..3c9bfb1d17 100644 --- a/var/spack/repos/builtin/packages/oniguruma/package.py +++ b/var/spack/repos/builtin/packages/oniguruma/package.py @@ -10,6 +10,25 @@ class Oniguruma(AutotoolsPackage): """Regular expression library.""" homepage = "https://github.com/kkos/oniguruma" - url = "https://github.com/kkos/oniguruma/releases/download/v6.1.3/onig-6.1.3.tar.gz" + url = "https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz" + version('6.9.4', sha256='4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53') version('6.1.3', sha256='480c850cd7c7f2fcaad0942b4a488e2af01fbb8e65375d34908f558b432725cf') + + @property + def libs(self): + return find_libraries('libonig', root=self.prefix, recursive=True) + + @run_after('install') + @on_package_attributes(run_tests=True) + def configuration_check(self): + onig_config = Executable(join_path(self.prefix.bin, 'onig-config')) + + assert onig_config('--cflags', output=str).rstrip() == \ + self.spec['oniguruma'].headers.include_flags + assert onig_config('--libs', output=str).rstrip() == \ + self.spec['oniguruma'].libs.ld_flags + assert onig_config('--prefix', output=str).rstrip() == \ + self.prefix + assert onig_config('--exec-prefix', output=str).rstrip() == \ + self.prefix -- cgit v1.2.3-70-g09d2