From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AEA23A0524 for ; Fri, 5 Feb 2021 12:34:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A8C8F188A1C; Fri, 5 Feb 2021 12:34:38 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 50DE440682 for ; Fri, 5 Feb 2021 12:34:37 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id 190so5761264wmz.0 for ; Fri, 05 Feb 2021 03:34:37 -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=LS3KqSN+Zw7wJn885oD5sbJ+4sEEVpzvYuXILizDXos=; b=N7jqxV/DYbFJqfmbOY+e5wjxPk+U1gL+usEn/j/1y8j8bDu1J1i3YfeBdaygxcXyZY ShG2pswwhvTdJWD7SFlblPh6lvPgTzsA7P9FnbQ7F/6sOHBlyA0jT+wGgghJmlE2VioE uXE4H2Q9Bd/hhJQwLw2uG23KQuHA8Mnxi3yk+ASyGop0P6MQAeOF2wuIMxIw2tJv3JK2 0NsAf0fXhCp8Qi3tKp4mII2sUBk5XDIeJsoU2mWXYqItNww9vME2c3iORYtykFq0ItFv Ops/RavdJ+4IP4RLKr9ahIxNBx5U3OOvU/R5AKTTGHlkEgcS7QC05tfRZcsW8+N5+mO0 Vhcw== 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=LS3KqSN+Zw7wJn885oD5sbJ+4sEEVpzvYuXILizDXos=; b=DXfWjS06acEtAxEL0oe2Iuw9Ol0j/rwXcX3wjXWhdcQHy8Dj20sXBO5JwlS1R98npp cU1WdQnj4gh3SLbL05Zs2uqitI3e6ai9V3OAQwlz0AdeKFEcgZMIBTpkFRzh13nnWYol MXrv1kBjQr3FLQR76qYIZPu/anOCOB2dJPlkX9sPpvNI7S3vBXEVL88166jj6nPcZbW3 IALZXlDalHaPWbClshJSoXoqte6ZFvuSWypxESlnuvg4A/NF/YaSxRkP1X8yLy5llGJW WIybll6JjbeusZe7WFiiJm0IoDBMnV7cylZTRQCu/FKnJVhYVFmZm+Qo2AUiYcskK3l3 BUuw== X-Gm-Message-State: AOAM5320L/VsM2Iop6zcYT0N+o6WfyiFMb08yVZJGjosjx+heoIavyrC jYnXNp2VkPIhhFuYmIrXR/I= X-Google-Smtp-Source: ABdhPJxrlDGxInQ2RY+k7apsEVDSftCDgG18iR+c/FukuYNAq9vWMTUi91WHfn8+jrfOcveq8hxbLQ== X-Received: by 2002:a1c:e309:: with SMTP id a9mr3190648wmh.99.1612524877141; Fri, 05 Feb 2021 03:34:37 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w2sm9292433wmg.27.2021.02.05.03.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:34:36 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Andrew Boyer , Honnappa Nagarahalli , Thomas Monjalon , dpdk stable Date: Fri, 5 Feb 2021 11:17:43 +0000 Message-Id: <20210205111920.1272063-177-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build: provide suitable error for "both" libraries option' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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/07/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9072f5e1e00cfadece396e998461fb5c30e1eef0 Thanks. Luca Boccassi --- >From 9072f5e1e00cfadece396e998461fb5c30e1eef0 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 11 Jan 2021 13:55:59 +0000 Subject: [PATCH] build: provide suitable error for "both" libraries option [ upstream commit 08895f10e7729c07ccd063501acd04e77c7730f5 ] Rather than having the DPDK configuration error out when linking apps and examples when "both" is select for "default_library" option, we can detect that setting earlier in the build config and provide a suitable error message to the user. Signed-off-by: Bruce Richardson Reviewed-by: Andrew Boyer Reviewed-by: Honnappa Nagarahalli Acked-by: Thomas Monjalon --- config/meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/meson.build b/config/meson.build index c02802c18e..d5bfbcec3e 100644 --- a/config/meson.build +++ b/config/meson.build @@ -303,3 +303,12 @@ if get_option('b_lto') add_project_link_arguments('-Wno-lto-type-mismatch', language: 'c') endif endif + +if get_option('default_library') == 'both' + error( ''' + Unsupported value "both" for "default_library" option. + + NOTE: DPDK always builds both shared and static libraries. Please set + "default_library" to either "static" or "shared" to select default linkage + for apps and any examples.''') +endif -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:37.158642319 +0000 +++ 0177-build-provide-suitable-error-for-both-libraries-opti.patch 2021-02-05 11:18:29.138697432 +0000 @@ -1 +1 @@ -From 08895f10e7729c07ccd063501acd04e77c7730f5 Mon Sep 17 00:00:00 2001 +From 9072f5e1e00cfadece396e998461fb5c30e1eef0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 08895f10e7729c07ccd063501acd04e77c7730f5 ] + @@ -11,2 +12,0 @@ -Cc: stable@dpdk.org - @@ -22 +22 @@ -index 1e6dfe0753..9abb30c39f 100644 +index c02802c18e..d5bfbcec3e 100644 @@ -25 +25 @@ -@@ -330,3 +330,12 @@ if get_option('b_lto') +@@ -303,3 +303,12 @@ if get_option('b_lto')