build: cleanup libpcap dependent components

The RTE_PORT_PCAP variable is used to signal libpcap availability,
though its name seems to refer to pcap support in the port library.
Prefer a generic name and add explicit link dependencies where needed.

Fixes: 7a944656b33f ("test/pcapng: test pcapng library")
Fixes: 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")
Fixes: cbb44143be74 ("app/dumpcap: add new packet capture application")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/app/dumpcap/meson.build b/app/dumpcap/meson.build
index ad4fc6ae60df732b11b9eb5dd5700333c463b880..69c016c780ddcb371e90b6ccff3853be999ee0ba 100644 (file)
--- a/app/dumpcap/meson.build
+++ b/app/dumpcap/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2019 Microsoft Corporation
 
-if not dpdk_conf.has('RTE_PORT_PCAP')
+if not dpdk_conf.has('RTE_HAS_LIBPCAP')
     build = false
     reason = 'missing dependency, "libpcap"'
 endif
@@ -12,5 +12,6 @@ if is_windows
     subdir_done()
 endif
 
+ext_deps += pcap_dep
 sources = files('main.c')
 deps += ['ethdev', 'pdump', 'pcapng', 'bpf']

diff --git a/app/test/meson.build b/app/test/meson.build
index b312bb72e7a35c824d4c9f2ec82d533c313baf6a..abab3fbb1d8b7202c62de5a96f2dc680230dec42 100644 (file)
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -411,7 +411,8 @@ if dpdk_conf.has('RTE_NET_RING')
     fast_tests += [['pdump_autotest', true]]
 endif
 
-if dpdk_conf.has('RTE_PORT_PCAP')
+if dpdk_conf.has('RTE_HAS_LIBPCAP')
+    ext_deps += pcap_dep
     test_sources += 'test_pcapng.c'
 endif
 
@@ -464,7 +465,7 @@ endif
 dpdk_test = executable('dpdk-test',
         test_sources,
         link_whole: link_libs,
-        dependencies: test_dep_objs,
+        dependencies: test_dep_objs + ext_deps,
         c_args: cflags,
         install_rpath: join_paths(get_option('prefix'),
              driver_install_path),

diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index ef861d05e75555c97e31a3928ce6c478a04be484..e3e9a1b0b59faa0f0d1f5d48c253082bfbb3e944 100644 (file)
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -3250,7 +3250,7 @@ test_bpf(void)
 
 REGISTER_TEST_COMMAND(bpf_autotest, test_bpf);
 
-#ifdef RTE_PORT_PCAP
+#ifdef RTE_HAS_LIBPCAP
 #include <pcap/pcap.h>
 
 static void
@@ -3447,4 +3447,4 @@ test_bpf_convert(void)
 }
 
 REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert);
-#endif /* RTE_PORT_PCAP */
+#endif /* RTE_HAS_LIBPCAP */

diff --git a/config/meson.build b/config/meson.build
index 17b5bec406c696ae9503b270afedb2dbc284a120..737cbd240a334a06c32904547d6e1def3dfa9c32 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -226,7 +226,7 @@ if not pcap_dep.found()
     pcap_dep = cc.find_library(pcap_lib, required: false)
 endif
 if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)
-    dpdk_conf.set('RTE_PORT_PCAP', 1)
+    dpdk_conf.set('RTE_HAS_LIBPCAP', 1)
     dpdk_extra_ldflags += '-l@0@'.format(pcap_lib)
 endif
 

diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build
index 54246095b2848f9863bac298d2e3079a1bcbcc21..ed7864eb9d09d7b479079155b927faa548664133 100644 (file)
--- a/drivers/net/pcap/meson.build
+++ b/drivers/net/pcap/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-if not dpdk_conf.has('RTE_PORT_PCAP')
+if not dpdk_conf.has('RTE_HAS_LIBPCAP')
     build = false
     reason = 'missing dependency, "libpcap"'
 endif

diff --git a/lib/bpf/bpf_stub.c b/lib/bpf/bpf_stub.c
index caec00f42f1f2a9dff7af57e059e6bc8ec2a9d89..ebc5343896339d52938a3260e792454352982866 100644 (file)
--- a/lib/bpf/bpf_stub.c
+++ b/lib/bpf/bpf_stub.c
@@ -27,7 +27,7 @@ rte_bpf_elf_load(const struct rte_bpf_prm *prm, const char *fname,
 }
 #endif
 
-#ifndef RTE_PORT_PCAP
+#ifndef RTE_HAS_LIBPCAP
 struct rte_bpf_prm *
 rte_bpf_convert(const struct bpf_program *prog)
 {

diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index 0df55a2236857550cb0c0238c1c55e1a7ec88fb3..cd739bb8277a5a3daf662df607d5b9459faed961 100644 (file)
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -33,12 +33,12 @@ if dep.found()
     sources += files('bpf_load_elf.c')
     ext_deps += dep
 else
-     warning('libelf is missing, rte_bpf_elf_load API will be disabled')
+    warning('libelf is missing, rte_bpf_elf_load API will be disabled')
 endif
 
-if dpdk_conf.has('RTE_PORT_PCAP')
+if dpdk_conf.has('RTE_HAS_LIBPCAP')
     sources += files('bpf_convert.c')
     ext_deps += pcap_dep
 else
-     warning('RTE_PORT_PCAP is missing, rte_bpf_convert API will be disabled')
+    warning('libpcap is missing, rte_bpf_convert API will be disabled')
 endif

diff --git a/lib/port/meson.build b/lib/port/meson.build
index 854bf39cd9a6ef3d8ef20d834bf70e18df8f63e5..3ab37e2cb4b7b22ca2f4e15c1563f9823f87f015 100644 (file)
--- a/lib/port/meson.build
+++ b/lib/port/meson.build
@@ -41,7 +41,8 @@ headers = files(
 )
 deps += ['ethdev', 'sched', 'ip_frag', 'cryptodev', 'eventdev']
 
-if dpdk_conf.has('RTE_PORT_PCAP')
+if dpdk_conf.has('RTE_HAS_LIBPCAP')
+    dpdk_conf.set('RTE_PORT_PCAP', 1)
     ext_deps += pcap_dep # dependency provided in config/meson.build
 endif