From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 78A30A04C3 for ; Fri, 22 Nov 2019 15:42:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6828B2BC7; Fri, 22 Nov 2019 15:42:30 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 85DFD2BC7 for ; Fri, 22 Nov 2019 15:42:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wOWD23IZc0b+agh8/Z5Vavi8ghxP+shNGtDKDzNXbFA=; b=R+KdRukx4nCoYia02wVFh2ZMur92/ZhhS4gVIbYPP9T5mN74HnF0I/Wx2Tlm4Pk36Pcays RWMUnB8LA8Fh6EBB297HOotNcIDvGpspSM7ZWYK7CEeWBRhEzARXwd2CBhopUCQoZMT7Pm 6JQhPtZe4Pf4snZKiYdipAd5HE27C8k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-89-PBHZUeqsOyeqv-784KIflg-1; Fri, 22 Nov 2019 09:42:25 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 775E4DBAC; Fri, 22 Nov 2019 14:42:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61C548516; Fri, 22 Nov 2019 14:42:23 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Luca Boccassi , dpdk stable Date: Fri, 22 Nov 2019 14:41:08 +0000 Message-Id: <20191122144131.21231-22-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: PBHZUeqsOyeqv-784KIflg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'build: remove redundant libs from pkgconfig' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/19. 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 rebasi= ng (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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/dc0b5308e3f03c6c2f= fb92122e4a58610cc5fd5e Thanks. Kevin. --- >From dc0b5308e3f03c6c2ffb92122e4a58610cc5fd5e Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 13 Aug 2019 01:03:53 +0200 Subject: [PATCH] build: remove redundant libs from pkgconfig [ upstream commit 167d9c67975fb2207e03644ce7b5e23d56b73e70 ] As explained in drivers/meson.build, " For the find_library() case (but not with dependency()) we also need to specify the "-l" flags in pkgconfig_extra_libs variable too, so that it can be reflected in the pkgconfig output for static builds. " The commit e30b4e566f47 ("build: improve dependency handling") must be followed up with this one in order to remove more occurences of pkgconfig_extra_libs redundant with use of dependency(). Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Fixes: 3c32e89f68e1 ("compress/isal: add skeleton ISA-L compression PMD") Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi --- drivers/compress/isal/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meso= n.build index 94c10fd60..70eee68f7 100644 --- a/drivers/compress/isal/meson.build +++ b/drivers/compress/isal/meson.build @@ -10,5 +10,4 @@ deps +=3D 'bus_vdev' sources =3D files('isal_compress_pmd.c', 'isal_compress_pmd_ops.c') ext_deps +=3D dep -pkgconfig_extra_libs +=3D '-lisal' =20 allow_experimental_apis =3D true --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.406503589 +0000 +++ 0022-build-remove-redundant-libs-from-pkgconfig.patch=092019-11-22 14:3= 6:55.190149436 +0000 @@ -1 +1 @@ -From 167d9c67975fb2207e03644ce7b5e23d56b73e70 Mon Sep 17 00:00:00 2001 +From dc0b5308e3f03c6c2ffb92122e4a58610cc5fd5e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 167d9c67975fb2207e03644ce7b5e23d56b73e70 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -26,2 +27 @@ - drivers/net/af_xdp/meson.build | 1 - - 2 files changed, 2 deletions(-) + 1 file changed, 1 deletion(-) @@ -30 +30 @@ -index 67b5c4aae..25578880d 100644 +index 94c10fd60..70eee68f7 100644 @@ -33 +33 @@ -@@ -11,5 +11,4 @@ deps +=3D 'bus_vdev' +@@ -10,5 +10,4 @@ deps +=3D 'bus_vdev' @@ -39,10 +38,0 @@ -diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.bui= ld -index ac679b92b..307aa0e38 100644 ---- a/drivers/net/af_xdp/meson.build -+++ b/drivers/net/af_xdp/meson.build -@@ -11,5 +11,4 @@ endif - if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linu= x/if_xdp.h') - =09ext_deps +=3D bpf_dep --=09pkgconfig_extra_libs +=3D '-lbpf' - else - =09build =3D false