summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/wireshark/package.py51
1 files changed, 17 insertions, 34 deletions
diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py
index cd334ed76e..8193cd011f 100644
--- a/var/spack/repos/builtin/packages/wireshark/package.py
+++ b/var/spack/repos/builtin/packages/wireshark/package.py
@@ -15,12 +15,9 @@ class Wireshark(CMakePackage):
version('2.6.0', sha256='711c7f01d27a8817d58277a5487cef3e3c7bab1c8caaf8f4c92aa21015b9117f')
- variant('smi', default=False, description='Build with libsmi')
variant('libssh', default=False, description='Build with libssh')
variant('nghttp2', default=False, description='Build with nghttp2')
variant('qt', default=False, description='Build with qt')
- variant('gtk3', default=False, description='Build with gtk3')
- variant('gtk', default=False, description='Build with gtk')
variant('headers', default=True, description='Install headers')
depends_on('bison', type='build')
@@ -37,28 +34,28 @@ class Wireshark(CMakePackage):
depends_on('lua@5.0.0:5.2.99')
depends_on('krb5')
depends_on('pkgconfig', type='build')
- depends_on('libsmi', when='+smi')
depends_on('libssh', when='+libssh')
depends_on('nghttp2', when='+nghttp2')
- depends_on('portaudio', when='+gtk')
- depends_on('portaudio', when='+gtk3')
depends_on('qt@4.8:', when='+qt')
- depends_on('gtkplus3', when='+gtk3')
- depends_on('gtkplus', when='+gtk')
- depends_on('adwaita-icon-theme', when='+gtk3')
def cmake_args(self):
- args = ['-DENEABLE_CARES=ON',
- '-DENABLE_GNUTLS=ON',
- '-DENABLE_LUA=ON',
- '-DENABLE_MAXMINDDB=ON',
- '-DYACC_EXECUTABLE=' + self.spec['bison'].prefix.bin.yacc,
- '-DGIT_EXECUTABLE=' + self.spec['git'].prefix.bin.git,
- '-DPCAP_INCLUDE_DIR=' + self.spec['libpcap'].prefix.include,
- '-DPCAP_LIB=' + str(self.spec['libpcap'].libs),
- '-DLUA_INCLUDE_DIR=' + self.spec['lua'].prefix.include,
- '-DLUA_LIBRARY=' + str(self.spec['lua'].libs)
- ]
+ args = [
+ '-DENEABLE_CARES=ON',
+ '-DENABLE_GNUTLS=ON',
+ '-DENABLE_LUA=ON',
+ '-DENABLE_MAXMINDDB=ON',
+ '-DYACC_EXECUTABLE=' + self.spec['bison'].prefix.bin.yacc,
+ '-DGIT_EXECUTABLE=' + self.spec['git'].prefix.bin.git,
+ '-DPCAP_INCLUDE_DIR=' + self.spec['libpcap'].prefix.include,
+ '-DPCAP_LIB=' + str(self.spec['libpcap'].libs),
+ '-DLUA_INCLUDE_DIR=' + self.spec['lua'].prefix.include,
+ '-DLUA_LIBRARY=' + str(self.spec['lua'].libs),
+ '-DBUILD_wireshark_gtk=OFF',
+ '-DENABLE_PORTAUDIO=OFF',
+ '-DENABLE_GTK3=OFF',
+ '-DBUILD_SMI=OFF',
+ ]
+
if self.spec.satisfies('+qt'):
args.append('-DBUILD_wireshark=ON')
args.append('-DENABLE_APPLICATION_BUNDLE=ON')
@@ -71,15 +68,6 @@ class Wireshark(CMakePackage):
args.append('-DENABLE_APPLICATION_BUNDLE=OFF')
args.append('-DENABLE_QT5=OFF')
- if self.spec.satisfies('+gtk3') or self.spec.satisfies('+gtk'):
- args.append('-DBUILD_wireshark_gtk=ON')
- args.append('-DENABLE_PORTAUDIO=ON')
- else:
- args.append('-DBUILD_wireshark_gtk=OFF')
- args.append('-DENABLE_PORTAUDIO=OFF')
- if self.spec.satisfies('+gtk3'):
- args.append('-DENABLE_GTK3=ON')
-
if self.spec.satisfies('+libssh'):
args.append('-DBUILD_sshdump=ON')
args.append('-DBUILD_ciscodump=ON')
@@ -87,11 +75,6 @@ class Wireshark(CMakePackage):
args.append('-DBUILD_sshdump=OFF')
args.append('-DBUILD_ciscodump=OFF')
- if self.spec.satisfies('+smi'):
- args.append('-DBUILD_SMI=ON')
- else:
- args.append('-DBUILD_SMI=OFF')
-
if self.spec.satisfies('+nghttp2'):
args.append('-DBUILD_NGHTTP2=ON')
else: