From bcd1272253d9dab27ef62b9996a91736235a5cc3 Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Wed, 13 Oct 2021 18:39:19 +0200 Subject: [PATCH] wireshark: Fix install race and skip network capture tests (#26698) The network capture tests can't pass when built as normal user. --- var/spack/repos/builtin/packages/wireshark/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 0290ed33560..38a2b13a7c9 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 @@ def install_headers(self): 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))