From b8de56ee61231ec0022ac1ec5d46bb8ff19e27bc Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 15 Aug 2018 19:27:31 +0100 Subject: 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. --- mesonbuild/dependencies/misc.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mesonbuild/dependencies/misc.py') 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 ', ctdep.env, [], [ctdep]) + v = ctdep.clib_compiler.get_return_value('pcap_lib_version', 'string', + '#include ', ctdep.env, [], [ctdep]) + v = re.sub(r'libpcap version ', '', v) + v = re.sub(r' -- Apple version.*$', '', v) + return v class CupsDependency(ExternalDependency): -- cgit v1.1