small cleanup and fixes
Subsystems (5)
v2 cover small cleanup and fixes
Made some small changes to meson to shorten the code and increase readability. While testing, found a number of issues on FreeBSD builds, which are fixed in this set too.
Bruce Richardson (5):
build: simplify subdirectory detection for EAL
build: increase readability via shortcut variables
distributor: skip building if power library not found examples/l2fwd-cat: fix build on FreeBSD devtools/test-meson-builds: fix support for FreeBSD
app/meson.build | 2 +- buildtools/meson.build | 2 +- config/meson.build | 21 +++++++++++++++++---- config/x86/meson.build | 2 +- devtools/test-meson-builds.sh | 5 ++++- doc/guides/contributing/coding_style.rst | 2 +- drivers/bus/dpaa/meson.build | 2 +- drivers/bus/fslmc/meson.build | 2 +- drivers/bus/pci/meson.build | 2 +- drivers/bus/vmbus/meson.build | 2 +- drivers/common/dpaax/meson.build | 2 +- drivers/crypto/caam_jr/meson.build | 2 +- drivers/crypto/ccp/meson.build | 2 +- drivers/crypto/dpaa2_sec/meson.build | 2 +- drivers/crypto/dpaa_sec/meson.build | 2 +- drivers/crypto/octeontx/meson.build | 2 +- drivers/event/dpaa/meson.build | 2 +- drivers/event/dpaa2/meson.build | 2 +- drivers/mempool/dpaa/meson.build | 2 +- drivers/mempool/dpaa2/meson.build | 2 +- drivers/meson.build | 2 +- drivers/net/af_packet/meson.build | 2 +- drivers/net/avp/meson.build | 2 +- drivers/net/axgbe/meson.build | 2 +- drivers/net/dpaa/meson.build | 2 +- drivers/net/dpaa2/meson.build | 2 +- drivers/net/enetc/meson.build | 2 +- drivers/net/failsafe/meson.build | 2 +- drivers/net/nfp/meson.build | 2 +- drivers/net/softnic/meson.build | 2 +- drivers/net/tap/meson.build | 2 +- drivers/net/vdev_netvsc/meson.build | 2 +- drivers/net/virtio/meson.build | 2 +- examples/distributor/meson.build | 3 +++ examples/l2fwd-cat/cat.c | 2 +- examples/l3fwd-power/meson.build | 2 +- examples/meson.build | 2 +- examples/tep_termination/meson.build | 2 +- examples/vdpa/meson.build | 4 ++-- examples/vhost/meson.build | 2 +- examples/vhost_scsi/meson.build | 2 +- kernel/meson.build | 2 +- lib/librte_eal/meson.build | 17 ++--------------- lib/librte_eventdev/meson.build | 2 +- lib/librte_kni/meson.build | 2 +- lib/librte_power/meson.build | 2 +- lib/librte_vhost/meson.build | 2 +- lib/meson.build | 4 ++-- 48 files changed, 72 insertions(+), 66 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/5 build: simplify subdirectory detection for EAL
Within EAL we had a series of if statements for selecting the EAL directory to use. Now that the directory names match those of the OS's they are for we can instead just use a generated subdirectory name, shortening the code. To avoid strange errors, we still need to check for unsupported OS's, but do this check up-front in the config meson.build file.
--- config/meson.build | 7 +++++++ lib/librte_eal/meson.build | 17 ++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)
config/meson.build +7 -0
@@ -1,6 +1,13 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation +# check the OS is supported, rather than going any further +supported_exec_envs = ['freebsd', 'linux', 'windows'] +exec_env = host_machine.system() +if not supported_exec_envs.contains(exec_env) + error('unsupported system type "@0@"'.format(exec_env)) +endif + # set the major version, which might be used by drivers and libraries # depending on the configuration options pver = meson.project_version().split('.')
lib/librte_eal/meson.build +2 -15
@@ -9,21 +9,8 @@ subdir('common') # defines common_sources, common_objs, etc. # Now do OS/exec-env specific settings, including building kernel modules # The <exec-env>/eal/meson.build file should define env_sources, etc. -if host_machine.system() == 'linux' - dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1) - subdir('linux/eal') - -elif host_machine.system() == 'freebsd' - dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1) - subdir('freebsd/eal') - -elif host_machine.system() == 'windows' - dpdk_conf.set('RTE_EXEC_ENV_WINDOWS', 1) - subdir('windows/eal') - -else - error('unsupported system type "@0@"'.format(host_machine.system())) -endif +dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1) +subdir(exec_env + '/eal') version = 10 # the version of the EAL API allow_experimental_apis = true
Signature · 1 line
2.20.1
Re: [dpdk-dev] [PATCH v2 1/5] build: simplify subdirectory detection for EAL
Quoted 13 lines · Bruce Richardson
Within EAL we had a series of if statements for selecting the EAL directory
to use. Now that the directory names match those of the OS's they are for
we can instead just use a generated subdirectory name, shortening the code.
To avoid strange errors, we still need to check for unsupported OS's, but
do this check up-front in the config meson.build file.Signed-off-by: Bruce Richardson <
[email protected]Quoted 1 line
Quoted 7 lines
Reviewed-by: David Marchand <
[email protected]Quoted 1 line
--- config/meson.build | 7 +++++++ lib/librte_eal/meson.build | 17 ++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH v2 2/5 build: increase readability via shortcut variables
In reply to Bruce RichardsonDefine variables for "is_linux", "is_freebsd" and "is_windows" to make the code shorter for comparisons and more readable.
--- app/meson.build | 2 +- buildtools/meson.build | 2 +- config/meson.build | 14 ++++++++++---- config/x86/meson.build | 2 +- doc/guides/contributing/coding_style.rst | 2 +- drivers/bus/dpaa/meson.build | 2 +- drivers/bus/fslmc/meson.build | 2 +- drivers/bus/pci/meson.build | 2 +- drivers/bus/vmbus/meson.build | 2 +- drivers/common/dpaax/meson.build | 2 +- drivers/crypto/caam_jr/meson.build | 2 +- drivers/crypto/ccp/meson.build | 2 +- drivers/crypto/dpaa2_sec/meson.build | 2 +- drivers/crypto/dpaa_sec/meson.build | 2 +- drivers/crypto/octeontx/meson.build | 2 +- drivers/event/dpaa/meson.build | 2 +- drivers/event/dpaa2/meson.build | 2 +- drivers/mempool/dpaa/meson.build | 2 +- drivers/mempool/dpaa2/meson.build | 2 +- drivers/meson.build | 2 +- drivers/net/af_packet/meson.build | 2 +- drivers/net/avp/meson.build | 2 +- drivers/net/axgbe/meson.build | 2 +- drivers/net/dpaa/meson.build | 2 +- drivers/net/dpaa2/meson.build | 2 +- drivers/net/enetc/meson.build | 2 +- drivers/net/failsafe/meson.build | 2 +- drivers/net/nfp/meson.build | 2 +- drivers/net/softnic/meson.build | 2 +- drivers/net/tap/meson.build | 2 +- drivers/net/vdev_netvsc/meson.build | 2 +- drivers/net/virtio/meson.build | 2 +- examples/l3fwd-power/meson.build | 2 +- examples/meson.build | 2 +- examples/tep_termination/meson.build | 2 +- examples/vdpa/meson.build | 4 ++-- examples/vhost/meson.build | 2 +- examples/vhost_scsi/meson.build | 2 +- kernel/meson.build | 2 +- lib/librte_eventdev/meson.build | 2 +- lib/librte_kni/meson.build | 2 +- lib/librte_power/meson.build | 2 +- lib/librte_vhost/meson.build | 2 +- lib/meson.build | 4 ++-- 44 files changed, 55 insertions(+), 49 deletions(-)
app/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -if host_machine.system() == 'windows' +if is_windows subdir_done() endif
buildtools/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -if host_machine.system() == 'windows' +if is_windows subdir_done() endif
config/meson.build +10 -4
@@ -8,6 +8,12 @@ if not supported_exec_envs.contains(exec_env) error('unsupported system type "@0@"'.format(exec_env)) endif +# define a handy variable for checking which OS we have. +# gives us "is_windows", "is_freebsd" and "is_linux" +foreach env:supported_exec_envs + set_variable('is_' + env, exec_env == env) +endforeach + # set the major version, which might be used by drivers and libraries # depending on the configuration options pver = meson.project_version().split('.')
@@ -95,9 +101,9 @@ if cc.find_library('libm', required : false).found() endif # for linux link against dl, for bsd execinfo -if host_machine.system() == 'linux' +if is_linux link_lib = 'dl' -elif host_machine.system() == 'freebsd' +elif is_freebsd link_lib = 'execinfo' else link_lib = ''
@@ -120,7 +126,7 @@ if numa_dep.found() and cc.has_header('numaif.h') endif # check for strlcpy -if host_machine.system() == 'linux' +if is_linux libbsd = dependency('libbsd', required: false) if libbsd.found() dpdk_conf.set('RTE_USE_LIBBSD', 1)
@@ -175,4 +181,4 @@ dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) install_headers('rte_config.h', subdir: get_option('include_subdir_arch')) # enable VFIO only if it is linux OS -dpdk_conf.set('RTE_EAL_VFIO', host_machine.system() == 'linux') +dpdk_conf.set('RTE_EAL_VFIO', is_linux)
config/x86/meson.build +1 -1
@@ -5,7 +5,7 @@ march_opt = ['-march=@0@'.format(machine)] # get binutils version for the workaround of Bug 97 -if host_machine.system() != 'windows' +if not is_windows ldver = run_command('ld', '-v').stdout().strip() if ldver.contains('2.30') if cc.has_argument('-mno-avx512f')
doc/guides/contributing/coding_style.rst +1 -1
@@ -856,7 +856,7 @@ build .. code-block:: python - if host_machine.system() != 'linux' + if not is_linux build = false endif
drivers/bus/dpaa/meson.build +1 -1
@@ -3,7 +3,7 @@ version = 2 -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/bus/fslmc/meson.build +1 -1
@@ -3,7 +3,7 @@ version = 2 -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/bus/pci/meson.build +1 -1
@@ -8,7 +8,7 @@ install_headers('rte_bus_pci.h') sources = files('pci_common.c', 'pci_common_uio.c', 'pci_params.c') -if host_machine.system() == 'linux' +if is_linux sources += files('linux/pci.c', 'linux/pci_uio.c', 'linux/pci_vfio.c')
drivers/bus/vmbus/meson.build +1 -1
@@ -11,7 +11,7 @@ sources = files('vmbus_common.c', 'vmbus_bufring.c', 'vmbus_common_uio.c') -if host_machine.system() == 'linux' +if is_linux sources += files('linux/vmbus_bus.c', 'linux/vmbus_uio.c') includes += include_directories('linux')
drivers/common/dpaax/meson.build +1 -1
@@ -3,7 +3,7 @@ allow_experimental_apis = true -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/crypto/caam_jr/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/crypto/ccp/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved. -if host_machine.system() != 'linux' +if not is_linux build = false endif dep = dependency('libcrypto', required: false)
drivers/crypto/dpaa2_sec/meson.build +1 -1
@@ -3,7 +3,7 @@ version = 2 -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/crypto/dpaa_sec/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/crypto/octeontx/meson.build +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/event/dpaa/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -if host_machine.system() != 'linux' +if not is_linux build = false endif deps += ['pmd_dpaa']
drivers/event/dpaa2/meson.build +1 -1
@@ -3,7 +3,7 @@ version = 2 -if host_machine.system() != 'linux' +if not is_linux build = false endif deps += ['bus_vdev', 'pmd_dpaa2', 'pmd_dpaa2_sec']
drivers/mempool/dpaa/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/mempool/dpaa2/meson.build +1 -1
@@ -3,7 +3,7 @@ version = 2 -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -if host_machine.system() == 'windows' +if is_windows subdir_done() endif
drivers/net/af_packet/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if host_machine.system() != 'linux' +if not is_linux build = false endif sources = files('rte_eth_af_packet.c')
drivers/net/avp/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -if host_machine.system() != 'linux' +if not is_linux build = false endif sources = files('avp_ethdev.c')
drivers/net/axgbe/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved. -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/net/dpaa/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -if host_machine.system() != 'linux' +if not is_linux build = false endif deps += ['mempool_dpaa']
drivers/net/dpaa2/meson.build +1 -1
@@ -3,7 +3,7 @@ version = 2 -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/net/enetc/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -if host_machine.system() != 'linux' +if not is_linux build = false endif
drivers/net/failsafe/meson.build +1 -1
@@ -5,7 +5,7 @@ cflags += '-std=gnu99' cflags += '-D_DEFAULT_SOURCE' cflags += '-D_XOPEN_SOURCE=700' cflags += '-pedantic' -if host_machine.system() == 'linux' +if is_linux cflags += '-DLINUX' else cflags += '-DBSD'
drivers/net/nfp/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -if host_machine.system() != 'linux' +if not is_linux build = false endif sources = files('nfpcore/nfp_cpp_pcie_ops.c',
drivers/net/softnic/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -if host_machine.system() != 'linux' +if not is_linux build = false endif allow_experimental_apis = true
drivers/net/tap/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 Luca Boccassi <[email protected]> -if host_machine.system() != 'linux' +if not is_linux build = false endif sources = files(
drivers/net/vdev_netvsc/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi <[email protected]> -if host_machine.system() != 'linux' +if not is_linux build = false endif sources = files('vdev_netvsc.c')
drivers/net/virtio/meson.build +1 -1
@@ -15,7 +15,7 @@ elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64') sources += files('virtio_rxtx_simple_neon.c') endif -if host_machine.system() == 'linux' +if is_linux dpdk_conf.set('RTE_VIRTIO_USER', 1) sources += files('virtio_user_ethdev.c',
examples/l3fwd-power/meson.build +1 -1
@@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if host_machine.system() != 'linux' +if not is_linux build = false endif allow_experimental_apis = true
examples/meson.build +1 -1
@@ -36,7 +36,7 @@ foreach example: examples ext_deps = [execinfo] includes = [include_directories(example)] deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline'] - if host_machine.system() == 'windows' + if is_windows deps = ['eal'] # only supported lib on Windows currently endif subdir(example)
examples/tep_termination/meson.build +1 -1
@@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if host_machine.system() != 'linux' +if not is_linux build = false endif deps += ['hash', 'vhost']
examples/vdpa/meson.build +2 -2
@@ -6,11 +6,11 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if host_machine.system() != 'linux' +if not is_linux build = false endif deps += 'vhost' allow_experimental_apis = true sources = files( 'main.c' -) +)
examples/vhost/meson.build +1 -1
@@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if host_machine.system() != 'linux' +if not is_linux build = false endif deps += 'vhost'
examples/vhost_scsi/meson.build +1 -1
@@ -6,7 +6,7 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' -if host_machine.system() != 'linux' +if not is_linux build = false endif
kernel/meson.build +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -subdir(host_machine.system()) +subdir(exec_env)
lib/librte_eventdev/meson.build +1 -1
@@ -4,7 +4,7 @@ version = 6 allow_experimental_apis = true -if host_machine.system() == 'linux' +if is_linux cflags += '-DLINUX' else cflags += '-DBSD'
lib/librte_kni/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if host_machine.system() != 'linux' or not dpdk_conf.get('RTE_ARCH_64') +if not is_linux or not dpdk_conf.get('RTE_ARCH_64') build = false endif version = 2
lib/librte_power/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if host_machine.system() != 'linux' +if not is_linux build = false endif sources = files('rte_power.c', 'power_acpi_cpufreq.c',
lib/librte_vhost/meson.build +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation -if host_machine.system() != 'linux' +if not is_linux build = false endif if has_libnuma == 1
lib/meson.build +2 -2
@@ -30,7 +30,7 @@ libraries = [ # flow_classify lib depends on pkt framework table lib 'flow_classify', 'bpf', 'telemetry'] -if host_machine.system() == 'windows' +if is_windows libraries = ['kvargs','eal'] # only supported libraries for windows endif
@@ -123,7 +123,7 @@ foreach l:libraries meson.current_source_dir(), dir_name, name) exports = [] implib = dir_name + '.dll.a' - if host_machine.system() == 'windows' + if is_windows exports = '@0@/@1@/rte_@2@_exports.def'.format( meson.current_source_dir(), dir_name, name) lk_args = ['-Wl,/def:' + exports, '-Wl,/implib:lib\\' + implib]
Signature · 1 line
2.20.1
PATCH v2 3/5 distributor: skip building if power library not found
In reply to Bruce RichardsonThe power library is not built on non-Linux systems, so skip the distributor sample if it's not found, as it's a mandatory dependency.
--- examples/distributor/meson.build | 3 +++ 1 file changed, 3 insertions(+)
examples/distributor/meson.build +3 -0
@@ -6,6 +6,9 @@ # To build this example as a standalone application with an already-installed # DPDK instance, use 'make' +# require the power library +build = dpdk_conf.has('RTE_LIBRTE_POWER') + deps += ['distributor', 'power'] sources = files( 'main.c'
Signature · 1 line
2.20.1
PATCH v2 4/5 examples/l2fwd-cat: fix build on FreeBSD
In reply to Bruce RichardsonThe definition of CPU_AND differs from Linux to BSD, so we need to use RTE_CPU_AND instead.
---
Note: for backporting to stable, this relies on c3568ea37670 also being backported to the release in question
--- examples/l2fwd-cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
examples/l2fwd-cat/cat.c +1 -1
@@ -345,7 +345,7 @@ check_cpus_overlapping(void)for (i =0 ; i < m_config_count; i++) {for (j = i +1 ; j < m_config_count; j++) { -CPU_AND (&mask, +RTE_CPU_AND (&mask, &m_config[i].cpumask, &m_config[j].cpumask);
Signature · 1 line
2.20.1
PATCH v2 5/5 devtools/test-meson-builds: fix support for FreeBSD
In reply to Bruce RichardsonThe pipefile option does not seem to exist on FreeBSD, giving an error when running the script.
---
V2: change "==" to "=" in comparison
--- devtools/test-meson-builds.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
devtools/test-meson-builds.sh +4 -1
@@ -7,7 +7,10 @@ # * if a build-directory already exists we assume it was properly configured # Run ninja after configuration is done. -set -o pipefail +# this option gives an error on BSD +if [ "`uname`" = "Linux" ] ; then + set -o pipefail +fi srcdir=$(dirname $(readlink -f $0))/.. MESON=${MESON:-meson}
Signature · 1 line
2.20.1
Re: [dpdk-dev] [PATCH v2 5/5] devtools/test-meson-builds: fix support for FreeBSD
09/04/2019 12:55, Bruce Richardson:
devtools/test-meson-builds.sh line 13
Quoted 7 lines
devtools/test-meson-builds.sh +4
-1-set -o pipefail +# this option gives an error on BSD +if [ "`uname`" = "Linux" ] ; then + set -o pipefail +fi
I think this is a bash option.
We may require bash at the top of this script as a workaround. Or we can revert the inital patch piping to cat for verbose mode.
Re: [dpdk-dev] [PATCH v2 5/5] devtools/test-meson-builds: fix support for FreeBSD
Quoted 13 lines · Thomas Monjalon
09/04/2019 12:55, Bruce Richardson:
devtools/test-meson-builds.sh line 13
Quoted 7 lines
devtools/test-meson-builds.sh +4
-1-set -o pipefail +# this option gives an error on BSD +if [ "`uname`" = "Linux" ] ; then + set -o pipefail +fiI think this is a bash option.
We may require bash at the top of this script as a workaround. Or we can revert the inital patch piping to cat for verbose mode.
Probably best to do the latter, I think. No real need to have two verbose modes, just one. Let me see what I can do, if there may be any other options.
/Bruce
09/04/2019 12:55, Bruce Richardson:
Quoted 10 lines
Made some small changes to meson to shorten the code and increase readability. While testing, found a number of issues on FreeBSD builds, which are fixed in this set too.
Bruce Richardson (5):
build: simplify subdirectory detection for EAL
build: increase readability via shortcut variables
distributor: skip building if power library not found examples/l2fwd-cat: fix build on FreeBSD devtools/test-meson-builds: fix support for FreeBSD
Applied without last patch, thanks.