From patchwork Fri Jan 11 16:26:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 49735 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 4F0951B8FD; Fri, 11 Jan 2019 17:26:33 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 1B6D71B8BA for ; Fri, 11 Jan 2019 17:26:27 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id z5so15786124wrt.11 for ; Fri, 11 Jan 2019 08:26:27 -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=gH9SyqXKqIl3NY8VWy7vAxkHkYypH62ndDkUyx++lVg=; b=DcN7BPj/6dhQ2YM06gL3c/7kiGCKGfSbIkoFsbZxKIqMqwm/0vI3aGXvZrTAjDK/W9 zgWXnrrYnXANvnN2k8zS3ZjAqOAnOfeDcX+YMMlwAr/sRGmqu/sULbEvtj7RZQU+qfTP mVLd51pQY+JbcYtnWHq0cbd1LRyrmQfsmbGftgYUGGY3WZd20ehClAGRCIwWoIELkHoV IL8lI5Fs8yuada+dmhe9Ep2e7LT7Zb0pjabz+ND4DNy4tRTQjpJdwdRaYhouucFP2lXP JiXxGeT+mjStLO2qvm0rRq2xc8OdWZpw253fTbGXjF6ww7QyBti2PTf6YXymj6nw8RyA aiEQ== X-Gm-Message-State: AJcUukcWb+fRkuaRhZIj3qVVySJAHvMDQt7xNPXLuSW5s3Tsjas2ZXlZ 1xjWyYRxqHqoUYlu8GVOFAagn1Yw510= X-Google-Smtp-Source: ALg8bN4+vFBqHq/mL7Hw9V3kCIgjaRm0IkSYsrgCWYgek944GSFdDLA8vhYpOmPc3AfsBxqkI/h53w== X-Received: by 2002:a5d:45d0:: with SMTP id b16mr13536312wrs.86.1547223986418; Fri, 11 Jan 2019 08:26:26 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id n6sm20437753wmk.9.2019.01.11.08.26.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 08:26:25 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, Luca Boccassi Date: Fri, 11 Jan 2019 16:26:08 +0000 Message-Id: <20190111162608.13162-4-bluca@debian.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111162608.13162-1-bluca@debian.org> References: <20190103175725.5836-1-bluca@debian.org> <20190111162608.13162-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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 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