Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/103968/?format=api
{ "id": 103968, "url": "http://patches.dpdk.org/api/patches/103968/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211108100920.31083-1-david.marchand@redhat.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20211108100920.31083-1-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211108100920.31083-1-david.marchand@redhat.com", "date": "2021-11-08T10:09:18", "name": "[1/2] build: cleanup libpcap dependent components", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "18a1fb69fb1307a03e572ee28a28d3c00bab469c", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20211108100920.31083-1-david.marchand@redhat.com/mbox/", "series": [ { "id": 20379, "url": "http://patches.dpdk.org/api/series/20379/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20379", "date": "2021-11-08T10:09:19", "name": "[1/2] build: cleanup libpcap dependent components", "version": 1, "mbox": "http://patches.dpdk.org/series/20379/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/103968/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/103968/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 9F71AA0C4B;\n\tMon, 8 Nov 2021 11:09:50 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 15BA941100;\n\tMon, 8 Nov 2021 11:09:47 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by mails.dpdk.org (Postfix) with ESMTP id 6242940151\n for <dev@dpdk.org>; Mon, 8 Nov 2021 11:09:44 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-213-_LDeE2efMZOROh5J_jEStA-1; Mon, 08 Nov 2021 05:09:38 -0500", "from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com\n [10.5.11.23])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12D771023F4E;\n Mon, 8 Nov 2021 10:09:37 +0000 (UTC)", "from dmarchan.remote.csb (unknown [10.40.194.192])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 382D819729;\n Mon, 8 Nov 2021 10:09:34 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1636366183;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding;\n bh=oE1vv70ElHNv+FOLDYwmnapRd4BM090PimADrJnQ4gU=;\n b=iUQ7AywnfRfN//fAh8vK3ldq9aXDlm7ldZrmmJdRjq1BkbLshAjSQvWY5IVM4ooMkVsERs\n pUz4JCnPSK6G2oWcUbT1cVF9je6BzsmeraTx5mQL2mfCMHDPh/AHFVO3rzYbSjPRYySvPE\n FeflxivHGmmUJFZkP82UHOGFy5FPKvM=", "X-MC-Unique": "_LDeE2efMZOROh5J_jEStA-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, Reshma Pattan <reshma.pattan@intel.com>,\n Stephen Hemminger <stephen@networkplumber.org>,\n Konstantin Ananyev <konstantin.ananyev@intel.com>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Ferruh Yigit <ferruh.yigit@intel.com>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>,\n Ray Kinsella <mdr@ashroe.eu>", "Date": "Mon, 8 Nov 2021 11:09:18 +0100", "Message-Id": "<20211108100920.31083-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.84 on 10.5.11.23", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH 1/2] build: cleanup libpcap dependent components", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The RTE_PORT_PCAP variable is used to signal libpcap availability,\nthough its name seems to refer to pcap support in the port library.\nPrefer a generic name and add explicit link dependencies where needed.\n\nFixes: 7a944656b33f (\"test/pcapng: test pcapng library\")\nFixes: 2eccf6afbea9 (\"bpf: add function to convert classic BPF to DPDK BPF\")\nFixes: cbb44143be74 (\"app/dumpcap: add new packet capture application\")\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n app/dumpcap/meson.build | 3 ++-\n app/test/meson.build | 5 +++--\n app/test/test_bpf.c | 4 ++--\n config/meson.build | 2 +-\n drivers/net/pcap/meson.build | 2 +-\n lib/bpf/bpf_stub.c | 2 +-\n lib/bpf/meson.build | 6 +++---\n lib/port/meson.build | 3 ++-\n 8 files changed, 15 insertions(+), 12 deletions(-)", "diff": "diff --git a/app/dumpcap/meson.build b/app/dumpcap/meson.build\nindex ad4fc6ae60..69c016c780 100644\n--- a/app/dumpcap/meson.build\n+++ b/app/dumpcap/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2019 Microsoft Corporation\n \n-if not dpdk_conf.has('RTE_PORT_PCAP')\n+if not dpdk_conf.has('RTE_HAS_LIBPCAP')\n build = false\n reason = 'missing dependency, \"libpcap\"'\n endif\n@@ -12,5 +12,6 @@ if is_windows\n subdir_done()\n endif\n \n+ext_deps += pcap_dep\n sources = files('main.c')\n deps += ['ethdev', 'pdump', 'pcapng', 'bpf']\ndiff --git a/app/test/meson.build b/app/test/meson.build\nindex 96670c3504..a12eadbb5a 100644\n--- a/app/test/meson.build\n+++ b/app/test/meson.build\n@@ -410,7 +410,8 @@ if dpdk_conf.has('RTE_NET_RING')\n fast_tests += [['pdump_autotest', true]]\n endif\n \n-if dpdk_conf.has('RTE_PORT_PCAP')\n+if dpdk_conf.has('RTE_HAS_LIBPCAP')\n+ ext_deps += pcap_dep\n test_sources += 'test_pcapng.c'\n endif\n \n@@ -463,7 +464,7 @@ endif\n dpdk_test = executable('dpdk-test',\n test_sources,\n link_whole: link_libs,\n- dependencies: test_dep_objs,\n+ dependencies: test_dep_objs + ext_deps,\n c_args: cflags,\n install_rpath: join_paths(get_option('prefix'),\n driver_install_path),\ndiff --git a/app/test/test_bpf.c b/app/test/test_bpf.c\nindex ef861d05e7..e3e9a1b0b5 100644\n--- a/app/test/test_bpf.c\n+++ b/app/test/test_bpf.c\n@@ -3250,7 +3250,7 @@ test_bpf(void)\n \n REGISTER_TEST_COMMAND(bpf_autotest, test_bpf);\n \n-#ifdef RTE_PORT_PCAP\n+#ifdef RTE_HAS_LIBPCAP\n #include <pcap/pcap.h>\n \n static void\n@@ -3447,4 +3447,4 @@ test_bpf_convert(void)\n }\n \n REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert);\n-#endif /* RTE_PORT_PCAP */\n+#endif /* RTE_HAS_LIBPCAP */\ndiff --git a/config/meson.build b/config/meson.build\nindex f7e2b2f331..5926892a68 100644\n--- a/config/meson.build\n+++ b/config/meson.build\n@@ -231,7 +231,7 @@ if not pcap_dep.found()\n pcap_dep = cc.find_library(pcap_lib, required: false)\n endif\n if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)\n- dpdk_conf.set('RTE_PORT_PCAP', 1)\n+ dpdk_conf.set('RTE_HAS_LIBPCAP', 1)\n dpdk_extra_ldflags += '-l@0@'.format(pcap_lib)\n endif\n \ndiff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build\nindex 54246095b2..ed7864eb9d 100644\n--- a/drivers/net/pcap/meson.build\n+++ b/drivers/net/pcap/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2017 Intel Corporation\n \n-if not dpdk_conf.has('RTE_PORT_PCAP')\n+if not dpdk_conf.has('RTE_HAS_LIBPCAP')\n build = false\n reason = 'missing dependency, \"libpcap\"'\n endif\ndiff --git a/lib/bpf/bpf_stub.c b/lib/bpf/bpf_stub.c\nindex caec00f42f..ebc5343896 100644\n--- a/lib/bpf/bpf_stub.c\n+++ b/lib/bpf/bpf_stub.c\n@@ -27,7 +27,7 @@ rte_bpf_elf_load(const struct rte_bpf_prm *prm, const char *fname,\n }\n #endif\n \n-#ifndef RTE_PORT_PCAP\n+#ifndef RTE_HAS_LIBPCAP\n struct rte_bpf_prm *\n rte_bpf_convert(const struct bpf_program *prog)\n {\ndiff --git a/lib/bpf/meson.build b/lib/bpf/meson.build\nindex 0df55a2236..cd739bb827 100644\n--- a/lib/bpf/meson.build\n+++ b/lib/bpf/meson.build\n@@ -33,12 +33,12 @@ if dep.found()\n sources += files('bpf_load_elf.c')\n ext_deps += dep\n else\n- warning('libelf is missing, rte_bpf_elf_load API will be disabled')\n+ warning('libelf is missing, rte_bpf_elf_load API will be disabled')\n endif\n \n-if dpdk_conf.has('RTE_PORT_PCAP')\n+if dpdk_conf.has('RTE_HAS_LIBPCAP')\n sources += files('bpf_convert.c')\n ext_deps += pcap_dep\n else\n- warning('RTE_PORT_PCAP is missing, rte_bpf_convert API will be disabled')\n+ warning('libpcap is missing, rte_bpf_convert API will be disabled')\n endif\ndiff --git a/lib/port/meson.build b/lib/port/meson.build\nindex 854bf39cd9..3ab37e2cb4 100644\n--- a/lib/port/meson.build\n+++ b/lib/port/meson.build\n@@ -41,7 +41,8 @@ headers = files(\n )\n deps += ['ethdev', 'sched', 'ip_frag', 'cryptodev', 'eventdev']\n \n-if dpdk_conf.has('RTE_PORT_PCAP')\n+if dpdk_conf.has('RTE_HAS_LIBPCAP')\n+ dpdk_conf.set('RTE_PORT_PCAP', 1)\n ext_deps += pcap_dep # dependency provided in config/meson.build\n endif\n \n", "prefixes": [ "1/2" ] }