diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2019-01-30 23:56:54 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-07-21 15:54:41 +0000 |
| commit | 6e5ba74b31e5053c0ba0f3eaa79ff97d03eb5595 (patch) | |
| tree | f1dcb909bf5fd4a5154af20d58b559e39c0d4eee /wsutil | |
| parent | cdac470a60a0fd4ac871072f732a13038e691e73 (diff) | |
Remove ABI compliance checker code.
It's broken, unmaintained, poorly implemented and obsoleted by saner
debug-info methods.
Note: To do the compliance check properly would require much more
extensive work to clearly define public and private interfaces (without
manual bookeeping of files or symbols either, of course, because who
would want that...).
Change-Id: Ib801f3c152ca2369f95ca1f4af4d37cd8cc7c47a
Reviewed-on: https://code.wireshark.org/review/33928
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | wsutil/win32-utils.h | 8 |
2 files changed, 0 insertions, 22 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index dbdc65554f..f7f0244292 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -7,8 +7,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # -include(UseABICheck) - add_definitions(-DPLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_LIBDIR}\") add_definitions(-DEXTCAP_DIR=\"${CMAKE_INSTALL_PREFIX}/${EXTCAP_INSTALL_LIBDIR}\") add_definitions(-DDATA_DIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}\") @@ -251,18 +249,6 @@ set_target_properties(wsutil PROPERTIES INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}" ) -ABICHECK(libwsutil) - -add_custom_command(OUTPUT libwsutil.abi.tar.gz - COMMAND ${CMAKE_COMMAND} -E remove_directory ${ABICHECK_TMPDIR} - COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR} - COMMAND ${ABI_COPY_COMMAND} ../config.h ${ABICHECK_TMPDIR}/ ${ABI_COPY_FLAGS} - COMMAND ${ABI_COPY_COMMAND} ${ABICHECK_HEADERS} ${ABICHECK_TMPDIR}/ ${ABI_COPY_FLAGS} - COMMAND ${ABICHECK_COMMAND} - COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps/libwsutil/libwsutil_* ${CMAKE_CURRENT_BINARY_DIR}/libwsutil.abi.tar.gz - COMMAND rm -rf ${ABICHECK_TMPDIR} ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps - DEPENDS ${HEADERS} wsutil) - target_link_libraries(wsutil PUBLIC ${CMAKE_DL_LIBS} diff --git a/wsutil/win32-utils.h b/wsutil/win32-utils.h index 54acfc755a..f2c24c2870 100644 --- a/wsutil/win32-utils.h +++ b/wsutil/win32-utils.h @@ -11,12 +11,6 @@ #ifndef __WIN32UTIL_H__ #define __WIN32UTIL_H__ -/* - * This is included in ABI checking, so protect it with #ifdef _WIN32, - * so it doesn't break ABI checking on UN*X. - */ -#ifdef _WIN32 - #include "ws_symbol_export.h" #include <glib.h> @@ -90,6 +84,4 @@ BOOL win32_create_process(const char *application_name, const char *command_line } #endif -#endif /* _WIN32 */ - #endif /* __WIN32UTIL_H__ */ |