Remove dpdk-pkg-config.patch

diff --git a/debian/changelog b/debian/changelog
index ab9b1c03c1857c67f8c5e26237e38ed3a39dd185..2b6d9a75f9c7756e902f9dc46d5d9d0c1e287da9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ collectd (5.8.0-1) UNRELEASED; urgency=medium
   * Enable the intel_rdt plugin, libpqos is now available.
   * Re-enable the varnish plugin, support for varnish 5.2 now implemented.
   * debian/patches:
+    - Removed dpdk-pkg-config.patch; included upstream.
     - Removed write_mongodb.patch; included upstream.
 
  -- Marc Fournier <marc@bl.uem.li>  Wed, 21 Feb 2018 07:02:01 +0100

diff --git a/debian/patches/dpdk-pkg-config.patch b/debian/patches/dpdk-pkg-config.patch
deleted file mode 100644 (file)
index e6c1f2e..0000000
--- a/debian/patches/dpdk-pkg-config.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Description: configure.ac: dpdk: use pkg-config
- To detect cflags and libs use the sometimes provided pkg-config for
- libdpdk. That avoids build errors on systems where special flags are
- needed and provided by dpdk via pkg-config, but not yet considered by
- the collectd build system.
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Forwarded: https://github.com/collectd/collectd/pull/2400
-Reviewed-by: Luca Boccassi <bluca@debian.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -2676,34 +2676,69 @@
- 
- # --with-libdpdk {{{
- AC_ARG_VAR([LIBDPDK_CPPFLAGS], [Preprocessor flags for libdpdk])
-+AC_ARG_VAR([LIBDPDK_CFLAGS], [Compiler flags for libdpdk])
- AC_ARG_VAR([LIBDPDK_LDFLAGS], [Linker flags for libdpdk])
-+AC_ARG_VAR([LIBDPDK_LIBS], [Libraries to link for libdpdk])
- 
--AC_ARG_WITH([libdpdk], [AS_HELP_STRING([--without-libdpdk], [Disable libdpdk.])])
-+AC_ARG_WITH([libdpdk],
-+  [AS_HELP_STRING([--without-libdpdk], [Disable libdpdk.])],
-+  [with_libdpdk="$withval"],
-+  [with_libdpdk="yes"]
-+)
- 
--if test "x$with_libdpdk" != "xno"
--then
--      if test "x$LIBDPDK_CPPFLAGS" = "x"
--      then
--              LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
--      fi
--      SAVE_CPPFLAGS="$CPPFLAGS"
--      CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
--      AC_CHECK_HEADERS([rte_config.h],
--              [with_libdpdk="yes"],
--              [with_libdpdk="no (rte_config.h not found)"]
--      )
--      CPPFLAGS="$SAVE_CPPFLAGS"
-+if test "x$with_libdpdk" != "xno"; then
-+  PKG_CHECK_MODULES([DPDK], [libdpdk], [],
-+                  [AC_MSG_NOTICE([no DPDK pkg-config, using defaults])])
-+  if test "x$LIBDPDK_CPPFLAGS" = "x"; then
-+    LIBDPDK_CPPFLAGS="-I/usr/include/dpdk"
-+  fi
-+  if test "x$LIBDPDK_CFLAGS" = "x"; then
-+      LIBDPDK_CFLAGS="$DPDK_CFLAGS"
-+      LIBDPDK_CPPFLAGS="$LIBDPDK_CPPFLAGS $DPDK_CFLAGS"
-+  fi
-+  if test "x$LIBDPDK_LIBS" = "x"; then
-+      if test "x$DPDK_LIBS" != "x"; then
-+          LIBDPDK_LIBS="$DPDK_LIBS"
-+      else
-+          LIBDPDK_LIBS="-ldpdk"
-+      fi
-+  fi
-+  SAVE_CPPFLAGS="$CPPFLAGS"
-+  CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS"
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$LIBDPDK_CFLAGS $CFLAGS"
-+  AC_CHECK_HEADERS([rte_config.h],
-+    [
-+      with_libdpdk="yes"
-+      AC_PREPROC_IFELSE(
-+        [
-+          AC_LANG_SOURCE(
-+            [[
-+              #include <rte_version.h>
-+              #if RTE_VERSION < RTE_VERSION_NUM(16,7,0,0)
-+              #error "required DPDK >= 16.07"
-+              #endif
-+            ]]
-+          )
-+        ],
-+        [dpdk_keepalive="yes"],
-+        [dpdk_keepalive="no (DPDK version < 16.07)"]
-+      )
-+    ],
-+    [with_libdpdk="no (rte_config.h not found)"]
-+  )
-+  CPPFLAGS="$SAVE_CPPFLAGS"
-+  CFLAGS="$SAVE_CFLAGS"
- fi
- 
--if test "x$with_libdpdk" = "xyes"
--then
--      SAVE_LDFLAGS="$LDFLAGS"
--      LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS"
--      AC_CHECK_LIB([dpdk], [rte_eal_init],
--              [with_libdpdk="yes"],
--              [with_libdpdk="no (symbol 'rte_eal_init' not found)"]
--      )
--      LDFLAGS="$SAVE_LDFLAGS"
-+if test "x$with_libdpdk" = "xyes"; then
-+  SAVE_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS"
-+  AC_CHECK_LIB([dpdk], [rte_eal_init],
-+    [with_libdpdk="yes"],
-+    [with_libdpdk="no (symbol 'rte_eal_init' not found)"]
-+  )
-+  LDFLAGS="$SAVE_LDFLAGS"
- fi
- 
- # }}}
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -420,8 +420,9 @@
- pkglib_LTLIBRARIES += dpdkstat.la
- dpdkstat_la_SOURCES = dpdkstat.c
- dpdkstat_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS)
-+dpdkstat_la_CFLAGS = $(AM_CFLAGS) $(LIBDPDK_CFLAGS)
- dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS)
--dpdkstat_la_LIBADD = -ldpdk
-+dpdkstat_la_LIBADD = $(LIBDPDK_LIBS)
- endif
- 
- if BUILD_PLUGIN_DRBD

diff --git a/debian/patches/series b/debian/patches/series
index 5630e9983dccf70592418ac5340c488342fb23dc..ecd9ee9f61b92bf306c196ce2f72cb51ab1aecd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ myplugin_includes.patch
 nagios-debian-paths.patch
 libcollectdclient_error_buffer.patch
 local-msr-index-h.patch
-dpdk-pkg-config.patch