From 97f90c07ac9a3867233c9b891060d1bd621f5833 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 17 Jan 2020 15:15:15 +0100 Subject: androiddump: Link against libwiretap and libwsutil With BUILD_androiddump and EXTCAP_ANDROIDDUMP_LIBPCAP enabled, the linker notices a couple of cases of underlinking: extcap/androiddump.c:541: error: undefined reference to 'ws_inet_pton4' extcap/androiddump.c:685: error: undefined reference to 'ws_hexstrtou32' extcap/androiddump.c:2513: error: undefined reference to 'cmdarg_err_init' extcap/androiddump.c:2517: error: undefined reference to 'data_file_url' extcap/androiddump.c:2629: error: undefined reference to 'ws_strtou16' extcap/androiddump.c:2592: error: undefined reference to 'ws_strtou16' extcap/androiddump.c:2646: error: undefined reference to 'ws_strtou16' extcap/androiddump.c:1708: error: undefined reference to 'ws_inet_pton4' extcap/androiddump.c:1783: error: undefined reference to 'ws_inet_pton4' Fix that by explicitly linking against libwiretap and libwsutil when the linker cannot find those symbols by linking to them through libwireshark. Change-Id: I4db266fe82927c12d18fec06f9d766b9390bcec3 Reviewed-on: https://code.wireshark.org/review/35855 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu Reviewed-by: Dario Lombardo Reviewed-by: Anders Broman --- extcap/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'extcap') diff --git a/extcap/CMakeLists.txt b/extcap/CMakeLists.txt index f28329fe8b..20c8bc13a9 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -91,6 +91,8 @@ if(BUILD_androiddump) if(HAVE_LIBPCAP) set(androiddump_LIBS ui + wiretap + wsutil ${GLIB2_LIBRARIES} ${WIN_WS2_32_LIBRARY} $<$:pcap::pcap> @@ -102,6 +104,7 @@ if(BUILD_androiddump) set(androiddump_LIBS ui wiretap + wsutil ${GLIB2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} -- cgit v1.2.3