[dpdk-stable] patch 'build: fix libm detection in meson' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 02433344bf7b5f4055ce432fbd3e16913a0252f7 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Thu, 9 Jan 2020 13:59:15 +0100
Subject: [PATCH] build: fix libm detection in meson

[ upstream commit 063c4c5fa0658e53d2187036532d1273acf5d645 ]

Using version 0.47.1, meson is unable to find the math library in Travis
for the 32bits job.
Quite surprisingly, this problem is not seen with the 64bits jobs.

Switching to 0.48.0, the problem disappears.

But we should pass 'm' to find_library instead of 'libm' anyway.

Fixes: 98edcbb5ab2f ("eal/windows: introduce Windows support")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 config/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/meson.build b/config/meson.build
index 364a8d7394..41747012df 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -105,7 +105,7 @@ add_project_link_arguments('-pthread', language: 'c')
 dpdk_extra_ldflags += '-pthread'
 
 # on some OS, maths functions are in a separate library
-if cc.find_library('libm', required : false).found()
+if cc.find_library('m', required : false).found()
 	# some libs depend on maths lib
 	add_project_link_arguments('-lm', language: 'c')
 	dpdk_extra_ldflags += '-lm'
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:39.294220040 +0000
+++ 0009-build-fix-libm-detection-in-meson.patch	2020-02-11 11:17:38.307999627 +0000
@@ -1,8 +1,10 @@
-From 063c4c5fa0658e53d2187036532d1273acf5d645 Mon Sep 17 00:00:00 2001
+From 02433344bf7b5f4055ce432fbd3e16913a0252f7 Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Thu, 9 Jan 2020 13:59:15 +0100
 Subject: [PATCH] build: fix libm detection in meson
 
+[ upstream commit 063c4c5fa0658e53d2187036532d1273acf5d645 ]
+
 Using version 0.47.1, meson is unable to find the math library in Travis
 for the 32bits job.
 Quite surprisingly, this problem is not seen with the 64bits jobs.
@@ -12,7 +14,6 @@
 But we should pass 'm' to find_library instead of 'libm' anyway.
 
 Fixes: 98edcbb5ab2f ("eal/windows: introduce Windows support")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
@@ -21,10 +22,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/config/meson.build b/config/meson.build
-index 01911ecf94..28a57f56fc 100644
+index 364a8d7394..41747012df 100644
 --- a/config/meson.build
 +++ b/config/meson.build
-@@ -115,7 +115,7 @@ add_project_link_arguments('-pthread', language: 'c')
+@@ -105,7 +105,7 @@ add_project_link_arguments('-pthread', language: 'c')
  dpdk_extra_ldflags += '-pthread'
  
  # on some OS, maths functions are in a separate library