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 E363DA0A0E for ; Mon, 10 May 2021 18:10:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DCC4C4003E; Mon, 10 May 2021 18:10:00 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750053.outbound.protection.outlook.com [40.107.75.53]) by mails.dpdk.org (Postfix) with ESMTP id 82C994003E for ; Mon, 10 May 2021 18:09:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KI2RYM3Vv1JHrWDURYC39GuGMgYYLBBnpAEW6u++oYzpiwg96O9AnPaIolFEc3zPnwkWaC0p3TnaToLESItP8JJu6WYK7d8ma9Zt3tMg3Eeuh8AWuIqMIW9oYFAHyZy+pGXBrR4Dld/k/fh5wxGpS/8ULZQWrHapuUZFP/bZ4sHT9woDAAouEY+NoqoZCSQumMMg+dP6kT/zW6EaZ++4prLS3RFlja9mYylOKSHof9PkwIVTOXYKu/a1fTUbpDzN305M33WM1pUzBwCByrXxyjwd61AzlU+YA3IcpRZiu23h1KbUdUD/0F6Fx/90AFcq478VYHcTAE9yxXMMtlBcJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IJLdLIkMYtlq+1vZJ/LLjQQRMLBXDf+mABr+yHkPoig=; b=IZlNLkZRTlKvBoQR0rr+6iWIRblunXgqBJLzpakvUg+FEURM48taqGi1AMu8JsuHJt6gaijRvsLCWeOZk8BkcdzYW35CbXpH9IGXb+WZ2I1fs1HtKQF11bki3EUF3bSV3oSOsLgh75ZSQ0jDX5I9WuMA5BYVHdPNvvfxUY940V6WLDpUZHJxvTvYsTvQ5EI4GY26mZsf2334YIyUp5AheOrSTMfO5Rf+Kz3bf1lctsPf+ahcv17Ym0H4NncJOWNdhtPNEOxb1FFrrQCk1InyLL5ZjvEyVVesmBP/tY7oBdRMHYGXCjwTxeIJsnT0U5OsjxLziBDcGeRzWFaCarJX0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IJLdLIkMYtlq+1vZJ/LLjQQRMLBXDf+mABr+yHkPoig=; b=GDS8CkrvGMhaQVWUg4oK3+tmneFxPSqyP+4HHn6ZeL/nEvOUGsaB5uWY+cEE9NcEIiUDQAy1JaC4G5N25GDWPg0Pp+s/hyoFTdmlfKXB62NiZDaVy3Z+0BnNrSrCavcg6NLfWCMNUAuPsEoSis2sLfr4BECeo3fctpyPT+OKBizaeedpjmC7d3Fk2pwu7olrwW2TxqKvD+igJrNbKF60HBf8641vmdJFatSflvSabZBcNtIMFeaAjPF7T7k+/rDg7peXo8yoJTSaaTyNOzAPZqhERyHAnWcYP+jh3vdbwN3OxhuGvWHDJJc7/TzaIdiyAMM4g218lG4xE/sEk0zLIQ== Received: from BN8PR04CA0037.namprd04.prod.outlook.com (2603:10b6:408:d4::11) by MN2PR12MB3998.namprd12.prod.outlook.com (2603:10b6:208:16d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:09:56 +0000 Received: from BN8NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:408:d4:cafe::cf) by BN8PR04CA0037.outlook.office365.com (2603:10b6:408:d4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:09:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT028.mail.protection.outlook.com (10.13.176.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:09:55 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:09:53 +0000 From: Xueming Li To: Thomas Monjalon CC: Luca Boccassi , Bruce Richardson , Andrew Rybchenko , David Marchand , dpdk stable Date: Tue, 11 May 2021 00:00:17 +0800 Message-ID: <20210510160258.30982-68-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c542a4af-e3bb-43d7-0be3-08d913ce0d7a X-MS-TrafficTypeDiagnostic: MN2PR12MB3998: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QRWwDBrMx7HkX2YcHInEHQitETZGhZ8nt29iiG44X1txhh2MgVOla4GdXmhs82l0jTE5DOuJn2Z/2mGko//Z0z4yFZDKLkYXA3bj1igxtf/u8c21aLMsUKjD8HQP/24cK9OTrvok+qwI36FsKSl0jCrB5K14CMc0y0QME26y/Yp4YP3lurXAFhmp+REWrseetC6yuQOTPK1otdJ5lMP8qIiG4JCYcHz4D1YqGAw1X9RSlaMKqDCySMyVLzlxWwDIDy/+z0r//6ElKsgvIMjDq9W2DLItWDG84brO3WwFRWRDjFtemI47aS31PBbjCKfOkXrrffjcKvdAhNPJzGFgXELxruVtekkquH8T0krZXBPcCxwIbmCYmHx9O6cImyQ1YiLFORnDGk3lZZxiPml2tfR2MDHPcxGQ30Q1SGx466MW8YUxod3m0ERSLdQqzRWjY8kXeW1zFztyvZIf8rmc+wImiJDRew/5KiwVSBxgbP1BXZ5pfBNczThn+yYGTGr/H0YDTmVtzOQCLhY8aPqjdwcQO62Q4KN+5icaHvikLk09C7iKphqnycsyknDm3ODRQKxyjjOumz3bZ7mjK1GSgspWi06CQEO66jWejl9JM7nxrgqliJHSPIxGh5vytVUzZU8AAU+IUKZivx865lTn8HynQgApCq13IhZXyoXe8X9NN1jazEWmPQXYZ4bme/cksBm0YAUYT9PRo9zVf/xND/lgWlGb15UdGLI4u88VBesYzzi63gMZecDaYtqLQf4PGLVgzyUePKoUNm+VIjqbog== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(376002)(136003)(39860400002)(346002)(46966006)(36840700001)(26005)(5660300002)(7696005)(86362001)(36756003)(36906005)(6286002)(36860700001)(966005)(356005)(336012)(478600001)(426003)(82740400003)(2616005)(6916009)(7636003)(70586007)(2906002)(53546011)(83380400001)(16526019)(6666004)(54906003)(47076005)(55016002)(8936002)(82310400003)(316002)(186003)(8676002)(70206006)(4326008)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:09:55.8239 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c542a4af-e3bb-43d7-0be3-08d913ce0d7a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3998 Subject: [dpdk-stable] patch 'build: detect execinfo library on Linux' has been queued to stable release 20.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/14702af2e52c0f1046fdb1e0006f09f1fb584b75 Thanks. Xueming Li --- >From 14702af2e52c0f1046fdb1e0006f09f1fb584b75 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 25 Feb 2021 02:49:19 +0100 Subject: [PATCH] build: detect execinfo library on Linux Cc: Luca Boccassi [ upstream commit 1cd512b2f5325c971c5bfdd7715debded986df27 ] The library execinfo and its header file can be installed on Alpine Linux where the backtrace feature is not part of musl libc: apk add libexecinfo-dev As a consequence, this library should not be restricted to BSD only. At the same time, the library and header are detected once and added globally to be linked with any application, internal or external. Fixes: 9065b1fac65f ("build: fix dependency on execinfo for BSD meson builds") Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Acked-by: Andrew Rybchenko Acked-by: David Marchand --- app/meson.build | 4 ---- app/test/meson.build | 1 - config/meson.build | 9 ++++++--- examples/meson.build | 4 +--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/meson.build b/app/meson.build index 87fc195dbf..50a53dbde8 100644 --- a/app/meson.build +++ b/app/meson.build @@ -21,9 +21,6 @@ apps = [ 'test-regex', 'test-sad'] -# for BSD only -lib_execinfo = cc.find_library('execinfo', required: false) - default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API'] default_ldflags = [] if get_option('default_library') == 'static' and not is_windows @@ -53,7 +50,6 @@ foreach app:apps dep_objs += get_variable(get_option('default_library') + '_rte_' + d) endforeach - dep_objs += lib_execinfo link_libs = [] if get_option('default_library') == 'static' diff --git a/app/test/meson.build b/app/test/meson.build index bdbc619476..3fdd22de7e 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -424,7 +424,6 @@ foreach d:test_deps def_lib = get_option('default_library') test_dep_objs += get_variable(def_lib + '_rte_' + d) endforeach -test_dep_objs += cc.find_library('execinfo', required: false) link_libs = [] if get_option('default_library') == 'static' diff --git a/config/meson.build b/config/meson.build index 2f150de3b8..5b7439aefb 100644 --- a/config/meson.build +++ b/config/meson.build @@ -125,11 +125,8 @@ if cc.find_library('m', required : false).found() dpdk_extra_ldflags += '-lm' endif -# for linux link against dl, for bsd execinfo if is_linux link_lib = 'dl' -elif is_freebsd - link_lib = 'execinfo' else link_lib = '' endif @@ -159,6 +156,12 @@ if fdt_dep.found() and cc.has_header('fdt.h') dpdk_extra_ldflags += '-lfdt' endif +libexecinfo = cc.find_library('libexecinfo', required: false) +if libexecinfo.found() and cc.has_header('execinfo.h') + add_project_link_arguments('-lexecinfo', language: 'c') + dpdk_extra_ldflags += '-lexecinfo' +endif + # check for libbsd libbsd = dependency('libbsd', required: false, method: 'pkg-config') if libbsd.found() diff --git a/examples/meson.build b/examples/meson.build index 3fe08d4ca5..d065a6a08b 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -6,8 +6,6 @@ if get_option('default_library') == 'static' link_whole_libs = dpdk_static_libraries + dpdk_drivers endif -execinfo = cc.find_library('execinfo', required: false) - # list of all example apps. Keep 1-3 per line, in alphabetical order. all_examples = [ 'bbdev_app', 'bond', @@ -82,7 +80,7 @@ foreach example: examples cflags = default_cflags ldflags = default_ldflags - ext_deps = [execinfo] + ext_deps = [] includes = [include_directories(example)] deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline'] subdir(example) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:28.419493400 +0800 +++ 0069-build-detect-execinfo-library-on-Linux.patch 2021-05-10 23:59:26.430000000 +0800 @@ -1 +1 @@ -From 1cd512b2f5325c971c5bfdd7715debded986df27 Mon Sep 17 00:00:00 2001 +From 14702af2e52c0f1046fdb1e0006f09f1fb584b75 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 1cd512b2f5325c971c5bfdd7715debded986df27 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -52 +54 @@ -index 561e493a29..099895fc87 100644 +index bdbc619476..3fdd22de7e 100644 @@ -55 +57 @@ -@@ -426,7 +426,6 @@ foreach d:test_deps +@@ -424,7 +424,6 @@ foreach d:test_deps @@ -64 +66 @@ -index 3cf560b8a3..66a2edcc47 100644 +index 2f150de3b8..5b7439aefb 100644 @@ -79 +81 @@ -@@ -166,6 +163,12 @@ if fdt_dep.found() and cc.has_header('fdt.h') +@@ -159,6 +156,12 @@ if fdt_dep.found() and cc.has_header('fdt.h')