diff options
| author | noguchi-k <55966120+noguchi-k@users.noreply.github.com> | 2020-02-18 23:08:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 08:08:10 -0600 |
| commit | f95348074b5d94961820fa551cd02113a571ebcd (patch) | |
| tree | 18cdf397177af850257ecb45a1f306f54926d25e /var | |
| parent | 86a3d58159f438d9442623bdfbf896901079a625 (diff) | |
| download | spack-f95348074b5d94961820fa551cd02113a571ebcd.tar.gz spack-f95348074b5d94961820fa551cd02113a571ebcd.tar.bz2 spack-f95348074b5d94961820fa551cd02113a571ebcd.tar.xz spack-f95348074b5d94961820fa551cd02113a571ebcd.zip | |
pegtl: change to virtual destructor (#14939)
* pegtl: change to virtual destructor
* pegtl: fix patch
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/pegtl/change_to_virtual_destructor.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pegtl/package.py | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/pegtl/change_to_virtual_destructor.patch b/var/spack/repos/builtin/packages/pegtl/change_to_virtual_destructor.patch new file mode 100644 index 0000000000..8de5c4e423 --- /dev/null +++ b/var/spack/repos/builtin/packages/pegtl/change_to_virtual_destructor.patch @@ -0,0 +1,13 @@ +--- spack-src/src/example/pegtl/json_classes.hpp.org 2020-02-14 11:07:25.117102793 +0900 ++++ spack-src/src/example/pegtl/json_classes.hpp 2020-02-14 11:08:06.841397607 +0900 +@@ -35,9 +35,7 @@ + { + } + +- ~json_base() +- { +- } ++ virtual ~json_base() = default; + }; + + inline std::ostream& operator<<( std::ostream& o, const json_base& j ) diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index 0da4bfe16f..7fe05c90fe 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -18,6 +18,9 @@ class Pegtl(CMakePackage): url = "https://github.com/taocpp/PEGTL/tarball/2.1.4" git = "https://github.com/taocpp/PEGTL.git" - version('develop', branch='master') + version('master', branch='master') version('2.1.4', sha256='d990dccc07b4d9ba548326d11c5c5e34fa88b34fe113cb5377da03dda29f23f2') version('2.0.0', sha256='5aae0505077e051cae4d855c38049cc6cf71103a6cc8d0ddef01a576e8a60cc0') + + # Ref: https://github.com/taocpp/PEGTL/blob/master/src/example/pegtl/json_classes.hpp + patch('change_to_virtual_destructor.patch', when='@:2.4') |