From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 52A07A051C for ; Tue, 11 Feb 2020 12:22:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 49C4A2B9C; Tue, 11 Feb 2020 12:22:39 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 929C22B9C for ; Tue, 11 Feb 2020 12:22:38 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id m16so11820068wrx.11 for ; Tue, 11 Feb 2020 03:22:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a5wdqXjY5G0ScXw3r5ktluJElritLMuzknc9XtDJPgc=; b=JtMkqmbp5okbjfvOQipV4moV3yzRbgJ8+hRXonCLKHel2X7Khl3sinifgTsoJ2N62P 54CdU5mu8CAkOg+DMUzPrcFA1fFmdPqChyhFO+fFxaUEcuKmxz0r95FbeIDo+BT8khnt WGamQ4QmpN0h/YdP82smb6cCGga9Xiat5yObDWEnqai9KJjZZW5t7UgLSE3vNgHfqYme uhdmT3r/28C3aktr3KFCBmzL8UxEHZurdWg+rb0j+gkirmA9NxPDpSArdts6vCotpssa r9pHhxfpthIq/oiUiTfB2qcUc0LxdprTORq5WxfKDbRJ2t4L/our7MwIpFpl0xP35zEb 8fbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a5wdqXjY5G0ScXw3r5ktluJElritLMuzknc9XtDJPgc=; b=VZ39HyNhy3T3oVhDTW38wcF4NEnDP83amKSPw4nTS2ZHlSpYxItWIQOqWVB3XvnaeF b7Uk0sKQZ+bx3/73n/yBlDzS9DgEeNe/RklYsoudRcR91+d2veLziyHTq4zf4zmX47er lsIHhhvFqKWORK7PhMbgX+iz03JZ5sFKVuJHhs7eUqyS+GXaSdbt8uNnnbA/i+6Eo5Mf r0DQZLWBWEEvqhv+lvu9tkqEPaUfZw/6lquTCWg6hmhjbNc1kpeYyce85lfEPINuaDRp 76ckQCV2SuxWVi32syTqsp4hUrSB8XCD2rOUm0Cz152aY8SAiHkJQg3omeJrkp7oxEz4 S1HQ== X-Gm-Message-State: APjAAAVldkpkbZMtZPp1fpMXaEXWF0LLqdguMJ87s/lLT7jquPUA0DNJ 16cml0rT7Xqk2PEokIbK5Fg= X-Google-Smtp-Source: APXvYqw4FSeFuoVwDL3IxKDPxF1S4+d27D7lMJwkBcYmruJP04dhz8Q9p2VtsxdVjF40oNV+OFzyIw== X-Received: by 2002:adf:f80c:: with SMTP id s12mr8096680wrp.1.1581420158217; Tue, 11 Feb 2020 03:22:38 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f207sm3591858wme.9.2020.02.11.03.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:22:37 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Bruce Richardson , dpdk stable Date: Tue, 11 Feb 2020 11:19:15 +0000 Message-Id: <20200211112216.3929-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build: fix libm detection in meson' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Bruce Richardson --- 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 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@dpdk.org Signed-off-by: David Marchand Acked-by: Bruce Richardson @@ -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