diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-15 19:27:31 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-26 17:23:39 +0100 |
| commit | b8de56ee61231ec0022ac1ec5d46bb8ff19e27bc (patch) | |
| tree | f43545253778fc8cca539f1d7045ffaaf6511972 | |
| parent | a956698c795ef0aa076f13e9b8864b51706acbfd (diff) | |
| download | meson-b8de56ee61231ec0022ac1ec5d46bb8ff19e27bc.zip meson-b8de56ee61231ec0022ac1ec5d46bb8ff19e27bc.tar.gz meson-b8de56ee61231ec0022ac1ec5d46bb8ff19e27bc.tar.bz2 | |
Only use the numeric part of the pcap_lib_version()
Trim 'libpcap version ' and ' -- Apple version'
Future work: Note that method of finding the pcap version can't work when
cross-compiling.
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index da7278b..72bda52 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -446,8 +446,11 @@ class PcapDependency(ExternalDependency): @staticmethod def get_pcap_lib_version(ctdep): - return ctdep.clib_compiler.get_return_value('pcap_lib_version', 'string', - '#include <pcap.h>', ctdep.env, [], [ctdep]) + v = ctdep.clib_compiler.get_return_value('pcap_lib_version', 'string', + '#include <pcap.h>', ctdep.env, [], [ctdep]) + v = re.sub(r'libpcap version ', '', v) + v = re.sub(r' -- Apple version.*$', '', v) + return v class CupsDependency(ExternalDependency): |