Skip to contentSkip to conversation

small fixes for FreeBSD builds

PATCH Applied Bruce Richardson 3 participants 6 messages Feb 25, 2019 – Feb 26, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover small fixes for FreeBSD builds

Set of three one-line fixes to improve the FreeBSD builds, particularly with -Dexamples=all set for meson builds.

Bruce Richardson (3):
test/compress: fix missing header include examples/ip_pipeline: disable build when no epoll examples/vhost_crypto: fix dependency on vhost library

 examples/ip_pipeline/meson.build  | 1 +
 examples/vhost_crypto/meson.build | 1 +
 test/test/test_compressdev.c      | 1 +
 3 files changed, 3 insertions(+)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 test/compress: fix missing header include

usleep() is defined in unistd.h, which is missing from include list in test_compressdev.c, causing compiler errors on FreeBSD.

Fixes b06aa643cac4 ("test/compress: add initial unit tests")
---
 test/test/test_compressdev.c | 1 +
 1 file changed, 1 insertion(+)
test/test/test_compressdev.c +1 -0
index e8476edd2..13cf26c9a 100644
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <zlib.h>
 #include <math.h>
+#include <unistd.h>
 
 #include <rte_cycles.h>
 #include <rte_malloc.h>
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/3 examples/ip_pipeline: disable build when no epoll

In reply to Bruce Richardson

The ip_pipeline example requires the epoll.h header from linux, so disable building the example if the header cannot be found.

Fixes 4bbf8e30aa5e ("examples/ip_pipeline: add CLI interface")
---
 examples/ip_pipeline/meson.build | 1 +
 1 file changed, 1 insertion(+)
examples/ip_pipeline/meson.build +1 -0
index 5e5fe6479..664223c97 100644
@@ -6,6 +6,7 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
+build = cc.has_header('sys/epoll.h')
 deps += ['pipeline', 'bus_pci']
 allow_experimental_apis = true
 sources = files(
Signature · 1 line
2.20.1
#3 lore raw

PATCH 3/3 examples/vhost_crypto: fix dependency on vhost library

In reply to Bruce Richardson

The vhost_crypto example app can't be used without the DPDK vhost library, so disable the build of the example if the lib hasn't been built.

Fixes f5188211c721 ("examples/vhost_crypto: add sample application")
---
 examples/vhost_crypto/meson.build | 1 +
 1 file changed, 1 insertion(+)
examples/vhost_crypto/meson.build +1 -0
index daf19fb87..8e9860f03 100644
@@ -6,6 +6,7 @@
 # To build this example as a standalone application with an already-installed
 # DPDK instance, use 'make'
 
+build = dpdk_conf.has('RTE_LIBRTE_VHOST')
 allow_experimental_apis = true
 deps += ['vhost', 'cryptodev']
 cflags += ['-D_FILE_OFFSET_BITS=64']
Signature · 1 line
2.20.1
Reviewed-by on v1 3/3
#4 lore raw

Re: [PATCH 3/3] examples/vhost_crypto: fix dependency on vhost library

Quoted 4 lines · Bruce Richardson

The vhost_crypto example app can't be used without the DPDK vhost library, so disable the build of the example if the lib hasn't been built.

Quoted 8 lines
Fixes f5188211c721 ("examples/vhost_crypto: add sample application")
---
  examples/vhost_crypto/meson.build | 1 +
  1 file changed, 1 insertion(+)

Thanks,
Maxime

#5 lore raw
In reply to Bruce Richardson

25/02/2019 16:23, Bruce Richardson:

Quoted 7 lines

Set of three one-line fixes to improve the FreeBSD builds, particularly with -Dexamples=all set for meson builds.

Bruce Richardson (3):
test/compress: fix missing header include examples/ip_pipeline: disable build when no epoll examples/vhost_crypto: fix dependency on vhost library

Applied, thanks