diff options
| author | haralmha <47558670+haralmha@users.noreply.github.com> | 2022-01-26 11:16:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 11:16:02 +0100 |
| commit | b7bb687d17d6adc1c5dd7ef74997612293581de1 (patch) | |
| tree | fb01e683d28c9c5f26a05e75d4ced34726d525c4 | |
| parent | e3d62b2f7be10bddc3c93c074fdbd3e22436f7f2 (diff) | |
| download | spack-b7bb687d17d6adc1c5dd7ef74997612293581de1.tar.gz spack-b7bb687d17d6adc1c5dd7ef74997612293581de1.tar.bz2 spack-b7bb687d17d6adc1c5dd7ef74997612293581de1.tar.xz spack-b7bb687d17d6adc1c5dd7ef74997612293581de1.zip | |
vbfnlo: use patch method and filter_file instead of patch directive (#28506)
* Patch only for @3.0.0beta5
* Replace version specific patch file with patch function
Co-authored-by: root <root@hahansencs8.cern.ch>
| -rw-r--r-- | var/spack/repos/builtin/packages/vbfnlo/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch | 13 |
2 files changed, 4 insertions, 14 deletions
diff --git a/var/spack/repos/builtin/packages/vbfnlo/package.py b/var/spack/repos/builtin/packages/vbfnlo/package.py index f29d1fc507..9cdd0a5b48 100644 --- a/var/spack/repos/builtin/packages/vbfnlo/package.py +++ b/var/spack/repos/builtin/packages/vbfnlo/package.py @@ -30,7 +30,6 @@ class Vbfnlo(AutotoolsPackage): # See https://github.com/vbfnlo/vbfnlo/issues/2 variant('doc', default=False, description='Build documentation') - patch('vbfnlo_no_docs.patch', when='~doc') depends_on('hepmc') depends_on('gsl') @@ -53,3 +52,7 @@ class Vbfnlo(AutotoolsPackage): "FCFLAGS=-std=legacy"] return args + + @when('@3.0.0beta3:~doc') + def patch(self): + filter_file("lib src doc", "lib src", "Makefile.am") diff --git a/var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch b/var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch deleted file mode 100644 index 520ac74334..0000000000 --- a/var/spack/repos/builtin/packages/vbfnlo/vbfnlo_no_docs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index e3cfec3..ebf48f4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,7 +5,7 @@ SUBDIRS = include \ - loops \ - amplitudes \ - phasespace \ -- lib src doc \ -+ lib src \ - regress - - ACLOCAL_AMFLAGS = -I m4 |