From 96b4580561cd2a8d1467143d67d2a612f0ddc75a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 9 Sep 2017 20:36:04 +0200 Subject: Directly link against libudev on Linux systems We previously dlopen()ed it, but it seems painful to do that without any real gain, except for possibly not having libudev in the address space and not having code #ifdefed for Linux. The latter means that we are a bit more likely to break stuff for non-Linux systems now if we play with udev, but at least we don't end up with it silently breaking because of a libudev ABI break. The existing function pointers in the struct were renamed and kept for compat purposes. Fixes Debian/apt#48 Also adjust prepare-release to strip [linux-any] from build-depends for travis. --- apt-pkg/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apt-pkg/CMakeLists.txt') diff --git a/apt-pkg/CMakeLists.txt b/apt-pkg/CMakeLists.txt index e3e078b81..651e55c79 100644 --- a/apt-pkg/CMakeLists.txt +++ b/apt-pkg/CMakeLists.txt @@ -44,6 +44,7 @@ target_include_directories(apt-pkg ${BZIP2_INCLUDE_DIR} ${LZMA_INCLUDE_DIRS} ${LZ4_INCLUDE_DIRS} + ${UDEV_INCLUDE_DIRS} ${ICONV_INCLUDE_DIRS} ) @@ -54,6 +55,7 @@ target_link_libraries(apt-pkg ${BZIP2_LIBRARIES} ${LZMA_LIBRARIES} ${LZ4_LIBRARIES} + ${UDEV_LIBRARIES} ${ICONV_LIBRARIES} ) set_target_properties(apt-pkg PROPERTIES VERSION ${MAJOR}.${MINOR}) -- cgit v1.2.3