cmake and build: add netlink lib requirement detection

The next patch adds netlink support to rbd-nbd. This patch just adds the
build related changes to bring in the netlink lib and test and build
against it.

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 88156715536924293fb3a8b610566369324e69db)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c652018dff2d189328cf243681e71e42c595b4d..09cce4cbdcaf1039d367c009947091fbb7d8b9b4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,15 +218,22 @@ if(LINUX)
   set(HAVE_UDEV ${UDEV_FOUND})
   find_package(blkid REQUIRED)
   set(HAVE_BLKID ${BLKID_FOUND})
+  if(WITH_RBD)
+    find_package(genl REQUIRED)
+    set(HAVE_GENL $GENL_FOUND)
+  endif()
 elseif(FREEBSD)
   set(HAVE_UDEV OFF)
   set(HAVE_LIBAIO OFF)
   set(HAVE_BLKID OFF)
+  set(HAVE_GENL OFF)
 else()
   set(HAVE_UDEV OFF)
   message(STATUS "Not using udev")
   set(HAVE_BLKID OFF)
   message(STATUS "Not using BLKID")
+  set(HAVE_GENL OFF)
+  message(STATUS "Not using GENL")
 endif(LINUX)
 
 option(WITH_OPENLDAP "OPENLDAP is here" ON)

diff --git a/ceph.spec.in b/ceph.spec.in
index 734542815756d37bcb995ba55bdfd8716cbeb4f2..62e6f5b87a07e4310ec4633241a0eb6aaa6ddfcf 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -167,6 +167,7 @@ BuildRequires:      libaio-devel
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: libcurl-devel
 BuildRequires: libudev-devel
+BuildRequires: libnl3-devel
 BuildRequires: liboath-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel

diff --git a/cmake/modules/Findgenl.cmake b/cmake/modules/Findgenl.cmake
new file mode 100644 (file)
index 0000000..07c5f35
--- /dev/null
+++ b/cmake/modules/Findgenl.cmake
@@ -0,0 +1,23 @@
+# - Find libnl-genl3
+# Find the genl library and includes
+#
+# GENL_INCLUDE_DIR - where to find netlink.h, etc.
+# GENL_LIBRARIES - List of libraries when using genl.
+# GENL_FOUND - True if genl found.
+
+find_path(GENL_INCLUDE_DIR NAMES netlink/netlink.h PATH_SUFFIXES libnl3)
+
+find_library(LIBNL_LIB nl-3)
+find_library(LIBNL_GENL_LIB nl-genl-3)
+set(GENL_LIBRARIES
+  ${LIBNL_LIB}
+  ${LIBNL_GENL_LIB}
+  )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(nl-genl-3
+  DEFAULT_MSG GENL_LIBRARIES GENL_INCLUDE_DIR)
+
+mark_as_advanced(
+  GENL_LIBRARIES
+  GENL_INCLUDE_DIR)

diff --git a/debian/control b/debian/control
index b073073ba137eed5f50bc4fff490fec510c664d7..242397e34a5a310d3af767afb914e6eab0a85128 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,8 @@ Build-Depends: cmake (>= 3.5),
                libssl-dev,
                libtool,
                libudev-dev,
+               libnl-3-dev,
+               libnl-genl-3-dev,
                libxml2-dev,
                librabbitmq-dev,
                lsb-release,

diff --git a/src/tools/rbd_nbd/CMakeLists.txt b/src/tools/rbd_nbd/CMakeLists.txt
index d7ce811e9634f7b19952428a87595c90fd1c02ff..5356fae4f9bdc51241c4d55a56932d4a6589158b 100644 (file)
--- a/src/tools/rbd_nbd/CMakeLists.txt
+++ b/src/tools/rbd_nbd/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_executable(rbd-nbd rbd-nbd.cc)
-target_link_libraries(rbd-nbd librbd librados global)
+target_include_directories(rbd-nbd PUBLIC ${GENL_INCLUDE_DIR})
+target_link_libraries(rbd-nbd librbd librados global ${GENL_LIBRARIES})
 install(TARGETS rbd-nbd DESTINATION bin)