zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wireshark: stop cmake from picking up /usr paths (#8053)

Browse Source 
* stop cmake from picking up /usr paths if spack has corresponding packages

Change-Id: I7217122562697c7a642cded2b4bfb606d2e35ffb

* add libpcap dependency

Change-Id: If0d5c2c94b2c2d1cbb9b19e31e44f870b71ba88b

* make cmake actually pick up pcap

Change-Id: I67b87fd9282c26f5ff4e0a5aedd8bbbae39a5960

* add libtool build dependency

Change-Id: I5c6d14dca7ccbe457318903dd170bb19d004e952

* use .libs for pcap

Change-Id: Ibe78f8765524385f9da4a8f9963f2c61632cc9f7

* explicitly add bison build dependency

Change-Id: I47112778abdf4c0de81789685a7eca4dddb20f77

* add lua explicitly

Change-Id: I8e306e1e4cfa0e16138f3a5109ddcfe912120946

* fix libs usage

Change-Id: I8c1e03f10df69e3ef74326a13cacaf0e5498e6aa

* add minimal version requirement

Change-Id: I4dd181389f9a63067df541b982bc0727f974d4ce
This commit is contained in:
healther
2018-05-10 13:58:43 +02:00
committed by Adam J. Stewart
parent 1f8fc574d9
commit f4a46f4fc3
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/wireshark/package.py
View File

@@ -42,15 +42,20 @@ class Wireshark(CMakePackage):
variant('gtk', default=False, description='Build with gtk')
variant('headers', default=True, description='Install headers')
depends_on('bison', type='build')
depends_on('cares')
depends_on('doxygen', type='build')
depends_on('flex', type='build')
depends_on('git', type='build')
depends_on('glib')
depends_on('gnutls')
depends_on('libgcrypt@1.4.2:')
depends_on('libmaxminddb')
depends_on('lua')
depends_on('libtool@2.2.2:', type='build')
depends_on('libpcap')
depends_on('lua@5.0.0:5.2.99')
depends_on('krb5')
depends_on('pkg-config', type='build')
depends_on('libsmi', when='+smi')
depends_on('libssh', when='+libssh')
depends_on('nghttp2', when='+nghttp2')
@@ -65,7 +70,14 @@ def cmake_args(self):
args = ['-DENEABLE_CARES=ON',
'-DENABLE_GNUTLS=ON',
'-DENABLE_LUA=ON',
'-DENABLE_MAXMINDDB=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)
]
if self.spec.satisfies('+qt'):
args.append('-DBUILD_wireshark=ON')
args.append('-DENABLE_APPLICATION_BUNDLE=ON')