From patchwork Fri Jan 11 18:22:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 49753 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A67031BACB; Fri, 11 Jan 2019 19:22:28 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 941931BA9F for ; Fri, 11 Jan 2019 19:22:23 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id b11so3307034wmj.1 for ; Fri, 11 Jan 2019 10:22:23 -0800 (PST) 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=8uOzixkrhEJ9ZPXa3KBmNIC4zvODpqVOv1d+SZ+B96o=; b=YPJNVqmQ1+59+JQdZ6592aC/Lh3F9VX3AFILjiBMSfNhqwNPdXpwTz9UwB826r98sD zoxMScjJFiDAN2JI97phOLOM7dRwluFVghw2lCqqZNz+mOXDOcH0jIyL0uc+q2nO5HSZ IwtvaQQjyfVs3yM/JH256eM1s0EYD66aAdQ4poDXEnOyQlHBcsRr2NiL94gOMfqM8/5M q0/k5Bq7g4n6NaDrGlsZUeZjot6BYopFY40QYpU4o3EPFa22DV8R6qO2Ftcg8gGbfx8N wftkY5afKUMZDVy2A0hseYtOVt9c7/Le23AQqQjStHWXnfy8uVT4vVTVmv4I3Ew8CfQT 3pmA== X-Gm-Message-State: AJcUukfsvrfq1BF9r78QXUMCqXrjfdtNNZE8HI9MFvJXJeaja2wA4QQG PRtw9CqE5Hqi2otv1Y6LBKXBjvh0zg4= X-Google-Smtp-Source: ALg8bN4X3tNFjM7dizm8+VDy/KG841S2PniJ0OqPAtWT1lGuVwy1EZQWeLUUD5CBdVlMn8btZ02sYQ== X-Received: by 2002:a1c:60c3:: with SMTP id u186mr3508979wmb.66.1547230943029; Fri, 11 Jan 2019 10:22:23 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id t4sm30717815wrb.64.2019.01.11.10.22.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 10:22:22 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, Luca Boccassi Date: Fri, 11 Jan 2019 18:22:04 +0000 Message-Id: <20190111182204.26031-4-bluca@debian.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111182204.26031-1-bluca@debian.org> References: <20190103175725.5836-1-bluca@debian.org> <20190111182204.26031-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 4/4] build: use dependency() for libbsd instead of manual append to ldflags X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Move libbsd inclusion to librte_eal, so that all other libraries and PMDs will inherit it. Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v3: only add dependency to librte_eal and let it propagate from there v4: add acked-by config/meson.build | 10 +++++----- lib/librte_eal/meson.build | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index db32499b3..e1af468ee 100644 --- a/config/meson.build +++ b/config/meson.build @@ -74,11 +74,11 @@ if numa_dep.found() and cc.has_header('numaif.h') endif # check for strlcpy -if host_machine.system() == 'linux' and cc.find_library('bsd', - required: false).found() and cc.has_header('bsd/string.h') - dpdk_conf.set('RTE_USE_LIBBSD', 1) - add_project_link_arguments('-lbsd', language: 'c') - dpdk_extra_ldflags += '-lbsd' +if host_machine.system() == 'linux' + libbsd = dependency('libbsd', required: false) + if libbsd.found() + dpdk_conf.set('RTE_USE_LIBBSD', 1) + endif endif # add -include rte_config to cflags diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index a18f3a826..fa60736c9 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -25,6 +25,9 @@ version = 9 # the version of the EAL API allow_experimental_apis = true deps += 'compat' deps += 'kvargs' +if dpdk_conf.has('RTE_USE_LIBBSD') + ext_deps += libbsd +endif sources = common_sources + env_sources objs = common_objs + env_objs headers = common_headers + env_headers