diff options
author | Jeroen Roovers <jer@gentoo.org> | 2020-01-17 15:15:15 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2020-01-25 10:05:27 +0000 |
commit | 97f90c07ac9a3867233c9b891060d1bd621f5833 (patch) | |
tree | 84529a7fba99fb35042d35b6998b530dc725f632 /extcap | |
parent | eb4e2cca69c5057995ff7d59848d784895904bb0 (diff) |
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 <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap')
-rw-r--r-- | extcap/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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} $<$<BOOL:${PCAP_FOUND}>:pcap::pcap> @@ -102,6 +104,7 @@ if(BUILD_androiddump) set(androiddump_LIBS ui wiretap + wsutil ${GLIB2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} |