From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 95E383421 for ; Tue, 22 Jan 2019 14:12:10 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id a62so14083311wmh.4 for ; Tue, 22 Jan 2019 05:12:10 -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=Aie6Op/bTe53N9tPg0HWtVWzkWlpgHwGyUMG/YeT7TF9ZHUhpHFfAPj1PDGBjgbujE XBcDkXjPO5TCy+WafLMmclS+9wiJ+IVmcV09vemvXoFdqd7fNcOaFpdg+AQe6s1B5PDv 3AS4n4/79bc8Apg65JNYSPJpkh9Gq2+vGaVQvOIdYU2S2BDauhcy08GifpQWb24XzDJN ftWX4Ywh9dEvLrvJ+XLTQjSWk19z4ih56Q2bbmSha1iNE0XjDH9PmN7fh9JbYep6PujI YvcgCjIVplU20wrxUsoQDYsxBgLiJwdbbvqAJ+lL/2WpOJ7b8mdCWvVzrSlwCgUKM61I pQoQ== X-Gm-Message-State: AJcUuke6O+PRY9KJNCh21VRfdQlJcAXnZFNxupR0afFigZhrBtcRTurL NRDw7j5t9itn5mBD6YLeYkcklQ5Q X-Google-Smtp-Source: ALg8bN7nKz3TF82APj8OsqXb3zNDV+mp8ElJXEhUti5ensoTpit0DAYxMkBrKeakPW7EphCvkkEtgQ== X-Received: by 2002:a1c:8c05:: with SMTP id o5mr3568420wmd.29.1548162729964; Tue, 22 Jan 2019 05:12:09 -0800 (PST) Received: from localhost ([2001:1be0:110d:fcfe:132c:a71a:1896:1395]) by smtp.gmail.com with ESMTPSA id 127sm99810045wmm.45.2019.01.22.05.12.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Jan 2019 05:12:09 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: Luca Boccassi , Bruce Richardson Date: Tue, 22 Jan 2019 13:10:54 +0000 Message-Id: <20190122131054.25196-4-bluca@debian.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190122131054.25196-1-bluca@debian.org> References: <20190103175725.5836-1-bluca@debian.org> <20190122131054.25196-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v5 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: , X-List-Received-Date: Tue, 22 Jan 2019 13:12:10 -0000 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 -- 2.20.1