diff options
| author |   Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-04-15 14:58:19 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-04-16 08:38:15 +0200 |
| commit | 9e4c98abf02cfe291441cfb6ee44eb2a09376681 (patch) | |
| tree | fc489edf3fae2686a5b9f62444e0072e4e5b0bae | |
| parent | b5989196bd978a33875fbddfaae02175845a9287 (diff) | |
drop 0003-build-mention-march-in-pkg-config-description.patch being in 18.11.1
Change-Id: I66bbaddae51fa4daa963cf680998ef5c21039a4f
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
| -rw-r--r-- | debian/patches/0003-build-mention-march-in-pkg-config-description.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 21 deletions
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 deleted file mode 100644 index 5b0af6fc..00000000 --- a/debian/patches/0003-build-mention-march-in-pkg-config-description.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Luca Boccassi <bluca@debian.org> -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 - ) diff --git a/debian/patches/series b/debian/patches/series index 7cb54213..f67da1c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 0002-build-use-generic-march-on-arm64-when-using-default.patch -0003-build-mention-march-in-pkg-config-description.patch 0004-build-bump-minimum-Meson-version-to-0.47.1.patch 0005-build-use-dependency-instead-of-find_library.patch 0006-build-reorder-libraries-and-build-eal-before-cmdline.patch |