diff options
| author | Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> | 2021-10-13 18:39:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 12:39:19 -0400 |
| commit | bcd1272253d9dab27ef62b9996a91736235a5cc3 (patch) | |
| tree | 442eaf9ce680b7a0ec05b759882144f6cf9700f2 /var | |
| parent | 6125117b5db0e1f8f3c437e84fc2237e3e8637de (diff) | |
| download | spack-bcd1272253d9dab27ef62b9996a91736235a5cc3.tar.gz spack-bcd1272253d9dab27ef62b9996a91736235a5cc3.tar.bz2 spack-bcd1272253d9dab27ef62b9996a91736235a5cc3.tar.xz spack-bcd1272253d9dab27ef62b9996a91736235a5cc3.zip | |
wireshark: Fix install race and skip network capture tests (#26698)
The network capture tests can't pass when built as normal user.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/wireshark/package.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 0290ed3356..38a2b13a7c 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -39,6 +39,11 @@ class Wireshark(CMakePackage): depends_on('nghttp2', when='+nghttp2') depends_on('qt@4.8:', when='+qt') + def patch(self): + # These try to capture from the network and run not compiled programs + filter_file('suite_capture', '', 'CMakeLists.txt') + filter_file('suite_unittests', '', 'CMakeLists.txt') + def cmake_args(self): args = [ '-DENEABLE_CARES=ON', @@ -96,5 +101,6 @@ class Wireshark(CMakePackage): folders = ['.', 'epan/crypt', 'epan/dfilter', 'epan/dissectors', 'epan/ftypes', 'epan/wmem', 'wiretap', 'wsutil'] for folder in folders: + mkdirp(join_path(prefix.include.wireshark, folder)) install(join_path(folder, '*.h'), join_path(prefix.include.wireshark, folder)) |