From 5abe9a96f9966613bd415cfcefe1a76d9291d5c8 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 22 Jan 2019 11:21:50 +0000 Subject: Bump minimum meson version to 0.47.1 and backport patches Fixes various bugs with Meson and dependencies parsing and generation. Change-Id: I2e7351e0954e16b1f4f928d2c09b653504fe8dc9 Signed-off-by: Luca Boccassi --- ...ild-mention-march-in-pkg-config-description.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 debian/patches/0003-build-mention-march-in-pkg-config-description.patch (limited to 'debian/patches/0003-build-mention-march-in-pkg-config-description.patch') diff --git a/debian/patches/0003-build-mention-march-in-pkg-config-description.patch b/debian/patches/0003-build-mention-march-in-pkg-config-description.patch new file mode 100644 index 00000000..5b0af6fc --- /dev/null +++ b/debian/patches/0003-build-mention-march-in-pkg-config-description.patch @@ -0,0 +1,20 @@ +Author: Luca Boccassi +Description: mention -march in pkg-config description + Applications need to at least match DPDK's -march option to build + successfully due to some static inline functions in the public headers. + This might cause problems, especially in distributions, so add a note + in the pkg-config description. +Origin: https://patches.dpdk.org/patch/49629/ +--- a/meson.build ++++ b/meson.build +@@ -83,7 +83,9 @@ pkg.generate(name: meson.project_name(), + libraries: dpdk_libraries, + libraries_private: dpdk_drivers + dpdk_libraries + + ['-Wl,-Bdynamic'] + dpdk_extra_ldflags, +- description: 'The Data Plane Development Kit (DPDK)', ++ description: '''The Data Plane Development Kit (DPDK). ++Note that CFLAGS might contain an -march flag higher than typical baseline. ++This is required for a number of static inline functions in the public headers.''', + subdirs: [get_option('include_subdir_arch'), '.'], + extra_cflags: ['-include', 'rte_config.h'] + machine_args + ) -- cgit 1.2.3-korg