From patchwork Wed Jun 13 06:35:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 138418 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp338626lji; Wed, 13 Jun 2018 00:00:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKII8dbNO2FH6kaWavUrbj5n3kIzMF/Sa4woEO7pIbcNvdueaIvrL4Bp8SMsNL/TPNuIWnlC X-Received: by 2002:a17:902:9a06:: with SMTP id v6-v6mr3859477plp.21.1528873244782; Wed, 13 Jun 2018 00:00:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528873244; cv=none; d=google.com; s=arc-20160816; b=mfzjYoR6WGck/9LxIDnFI+AukVTRBPloUPzk5Cb0AQoTxGjX0JC8ZPyoJg2XP+3DjR BI0xDZShioSwirrpMFS/w1lttEwDA3Ea6n6lLHkA9jcuCT/4Mw7+gPYW6h+KPHhFXpwe GjnF71nj4ZFommmXKxKERsl1mt4ie+HARpX0ZUr5p6cMcveBV+i6qB0xg+URCdPYd+jj Sqh2MOn5C/l4srnNx+fxqs3IfClbiSTpkjs5ui7sDC2bx2uW6q53lSOwhqRMF7b66LGJ diK3hkHIzpgxm9FUa1bJmgxNQledJgHvrLR6kJg+Cf9guAdHeX0ecoBAADWQ+2gDud9H kSwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=mziWL5SJRnU10f94W7cysE3WwrfADvZs5uYtrioEE7M=; b=qi5ex1Jp3o7dVJ5Roq5rTtuC1JW5YE0Haz7CQWWQ/BjgKCHI0UgLO0iHaibosfnue/ 6hW4SbMEFXHjD9hoibSmCpo14DZVTAg4URUUfrHysm4/Dyq6zgUCa4Jxte0k7fe3g9FC dnOLJ5fEab95KCFBg4bYxUe2Z/7sHGAAISJqzUi0FI4dNmR/TrHLNNB35OFXGgUap5Al tnNx3RWBnW0wmu19mrdKYZxvj7Jdc8F74edDmn7XwHBECG6/RVYvgwRAYHeJIDB/SkCL WJyXUAKLClZH/965CZhDczB+uxx2byLdBqXcXpQyBkdbSb0XxbtVzlpEZ3gtYCXrdSgu tGlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P3Wz6EWw; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r18-v6si1774106pgd.143.2018.06.13.00.00.44; Wed, 13 Jun 2018 00:00:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P3Wz6EWw; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9CAC778DE3; Wed, 13 Jun 2018 07:00:39 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f50.google.com (mail-pl0-f50.google.com [209.85.160.50]) by mail.openembedded.org (Postfix) with ESMTP id 63B5B7450D for ; Wed, 13 Jun 2018 06:35:11 +0000 (UTC) Received: by mail-pl0-f50.google.com with SMTP id t12-v6so928314plo.7 for ; Tue, 12 Jun 2018 23:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gIMpWAm86KWak6ASfbdJ0zHSQ/qpzs0bZ8RdoFJjkds=; b=P3Wz6EWw4VA1MUc5uGWj+748e/0jTrzn28JtipgjCo3P9nuXDvRrnzb+3owjYK5RMm ZwZNr04UabnILSllqktyT9rT0SpTLEDU0R2I48vRCOQn7Y8sfcnvFUcThiyGvJCoDZKY PVdi0bszlDmOBpKHrssPD79OtTkqCQuc/NIhTXPrJZ59IY5hxCStcIJgbUW3PbOeOr0v GpwuibHGqcsZ0b0wXghB80rIgOK5DHxwFs7kCOdrMZODydTmK5v3mmKeexH9h1wvPIYo oZsMq3/ANLYhGDR5/ZAuG820GnoTFchjHJ5HHeayLwngbs+gUPslxpQFUrNJFIn61KOU 6eEw== 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; bh=gIMpWAm86KWak6ASfbdJ0zHSQ/qpzs0bZ8RdoFJjkds=; b=FSGNQpYcGa/UKxfEHLesyKJZbbHsuRhkVSgpx3I7ztmTbKP2SuA4o0d11+gyI7h9+w X9riufBEY4YWNOyKldg7K1RBy1CDI+gZYE/MtJKnAckDmWgGckDjG6ISSPuJ8rT0xj6r yBSqR10C/RhG88INYO5CcsMJMzuWfGQ1GBl3X3j1oG92slQ33XKjSs4/D4uNm1ki1OIy rd+lL61ImdllRBaAGI939MsPodgYXkpYNBKtYB4vfCo6hgpPMehwT4I7QcINnNFafVaZ deJjQpWS14Ar4acUz34Y8DpED3o1I/dcTvePegJtOjkh+zdP5F5jr0kI9zy2IVJ14dJP GsEA== X-Gm-Message-State: APt69E1wVEiy9EFF0QANumpv44vXR1lB1+hN/FzIt3KTKRd9hq3KbviL 8+R0mDT+pOO6M5m+qLe3ARDKsA== X-Received: by 2002:a17:902:46e:: with SMTP id 101-v6mr1957994ple.39.1528871711903; Tue, 12 Jun 2018 23:35:11 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id b83-v6sm3525707pfe.159.2018.06.12.23.35.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 23:35:11 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 12 Jun 2018 23:35:08 -0700 Message-Id: <20180613063512.1755-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [oe] [meta-networking][PATCH V2 1/5] rdma-core: Update to version 18 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with musl Signed-off-by: Khem Raj --- ...Remove-man-files-which-cant-be-built.patch | 103 ++++++++++++++++++ ...IFSOCK-is-defined-in-both-glibc-musl.patch | 29 +++++ ...ude-endian.h-for-htole32-and-friends.patch | 25 +++++ ...Remove-unused-include-for-execinfo.h.patch | 27 +++++ ...igh.c-Do-not-include-net-if_packet.h.patch | 26 +++++ .../{rdma-core_17.bb => rdma-core_18.1.bb} | 10 +- 6 files changed, 218 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch rename meta-networking/recipes-support/rdma-core/{rdma-core_17.bb => rdma-core_18.1.bb} (57%) -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch new file mode 100644 index 0000000000..4b595613fa --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch @@ -0,0 +1,103 @@ +From 5a8a2f81ef8650f06d1d9d268add612ab46025f1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Jun 2018 22:57:04 -0700 +Subject: [PATCH] Remove man files which cant be built + +Remove need for pandoc-prebuilt during cross build + +Fixes errors + +| CMake Error at libibumad/man/cmake_install.cmake:105 (file): +| file INSTALL cannot find +| "/mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/rdma-core/18.1-r0/git/buildlib/pandoc-prebuilt/41bbb0bed7a781be59e8c0dcd8b7278af2ce6882". +| Call Stack (most recent call first): +| cmake_install.cmake:48 (include) + +Signed-off-by: Khem Raj +--- + libibumad/man/CMakeLists.txt | 1 - + libibverbs/man/CMakeLists.txt | 15 --------------- + providers/mlx5/man/CMakeLists.txt | 1 - + 3 files changed, 17 deletions(-) + +diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt +index 185584a0..ac45a4e9 100644 +--- a/libibumad/man/CMakeLists.txt ++++ b/libibumad/man/CMakeLists.txt +@@ -15,7 +15,6 @@ rdma_man_pages( + umad_get_mad_addr.3 + umad_get_pkey.3 + umad_get_port.3 +- umad_init.3.md + umad_open_port.3 + umad_poll.3 + umad_recv.3 +diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt +index 86dd49de..b54675be 100644 +--- a/libibverbs/man/CMakeLists.txt ++++ b/libibverbs/man/CMakeLists.txt +@@ -5,7 +5,6 @@ rdma_man_pages( + ibv_alloc_pd.3 + ibv_alloc_td.3 + ibv_asyncwatch.1 +- ibv_attach_mcast.3.md + ibv_bind_mw.3 + ibv_create_ah.3 + ibv_create_ah_from_wc.3 +@@ -14,7 +13,6 @@ rdma_man_pages( + ibv_create_cq_ex.3 + ibv_modify_cq.3 + ibv_create_flow.3 +- ibv_create_flow_action.3.md + ibv_create_qp.3 + ibv_create_qp_ex.3 + ibv_create_rwq_ind_table.3 +@@ -23,15 +21,9 @@ rdma_man_pages( + ibv_create_wq.3 + ibv_devices.1 + ibv_devinfo.1 +- ibv_event_type_str.3.md +- ibv_fork_init.3.md + ibv_get_async_event.3 + ibv_get_cq_event.3 +- ibv_get_device_guid.3.md + ibv_get_device_list.3 +- ibv_get_device_name.3.md +- ibv_get_srq_num.3.md +- ibv_inc_rkey.3.md + ibv_modify_qp.3 + ibv_modify_qp_rate_limit.3 + ibv_modify_srq.3 +@@ -46,19 +38,12 @@ rdma_man_pages( + ibv_post_srq_recv.3 + ibv_query_device.3 + ibv_query_device_ex.3 +- ibv_query_gid.3.md +- ibv_query_pkey.3.md + ibv_query_port.3 + ibv_query_qp.3 + ibv_query_rt_values_ex.3 + ibv_query_srq.3 +- ibv_rate_to_mbps.3.md +- ibv_rate_to_mult.3.md + ibv_rc_pingpong.1 + ibv_reg_mr.3 +- ibv_req_notify_cq.3.md +- ibv_rereg_mr.3.md +- ibv_resize_cq.3.md + ibv_srq_pingpong.1 + ibv_uc_pingpong.1 + ibv_ud_pingpong.1 +diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt +index cdc7115e..876b6fcf 100644 +--- a/providers/mlx5/man/CMakeLists.txt ++++ b/providers/mlx5/man/CMakeLists.txt +@@ -1,5 +1,4 @@ + rdma_man_pages( +- mlx5dv_flow_action_esp.3.md + mlx5dv_get_clock_info.3 + mlx5dv_init_obj.3 + mlx5dv_query_device.3 +-- +2.17.1 + diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch new file mode 100644 index 0000000000..b04c9b7230 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch @@ -0,0 +1,29 @@ +From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 8 Jun 2018 20:17:57 -0700 +Subject: [PATCH] S_IFSOCK is defined in both glibc/musl + +Fixes + +preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in this function); did you mean 'S_IFSOCK'? + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + librdmacm/preload.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/librdmacm/preload.c b/librdmacm/preload.c +index 0f2aa250..d46beb1b 100644 +--- a/librdmacm/preload.c ++++ b/librdmacm/preload.c +@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat *buf) + if (fd_get(socket, &fd) == fd_rsocket) { + ret = real.fxstat(ver, socket, buf); + if (!ret) +- buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK; ++ buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; + } else { + ret = real.fxstat(ver, fd, buf); + } diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch new file mode 100644 index 0000000000..aa335244b6 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch @@ -0,0 +1,25 @@ +From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Jun 2018 19:15:52 -0700 +Subject: [PATCH 1/2] include endian.h for htole32 and friends + +Signed-off-by: Khem Raj +--- + providers/hns/hns_roce_u.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h +index bd66c6e7..b07424db 100644 +--- a/providers/hns/hns_roce_u.h ++++ b/providers/hns/hns_roce_u.h +@@ -34,6 +34,7 @@ + #define _HNS_ROCE_U_H + + #include ++#include + #include + + #include +-- +2.17.1 + diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch new file mode 100644 index 0000000000..347f964e94 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch @@ -0,0 +1,27 @@ +From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Jun 2018 19:18:24 -0700 +Subject: [PATCH 2/2] Remove unused include for execinfo.h + +Fixes build on musl + +Signed-off-by: Khem Raj +--- + providers/qedr/qelr_verbs.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c +index e3b01f28..2ee1c832 100644 +--- a/providers/qedr/qelr_verbs.c ++++ b/providers/qedr/qelr_verbs.c +@@ -54,7 +54,6 @@ + + #include + #include +-#include + + #define QELR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) + #define QELR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) +-- +2.17.1 + diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch new file mode 100644 index 0000000000..e887f222b0 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch @@ -0,0 +1,26 @@ +From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 8 Jun 2018 20:19:13 -0700 +Subject: [PATCH] neigh.c: Do not include net/if_packet.h + +This header is glibc specific + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + libibverbs/neigh.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c +index 21177db0..cfc593a0 100644 +--- a/libibverbs/neigh.c ++++ b/libibverbs/neigh.c +@@ -2,7 +2,6 @@ + */ + + #include "config.h" +-#include + #include + #include + #include diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_17.bb b/meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb similarity index 57% rename from meta-networking/recipes-support/rdma-core/rdma-core_17.bb rename to meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb index 5d0329919f..6ad864d1e8 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_17.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb @@ -5,8 +5,14 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS_${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;protocol=http" -SRCREV ="5ce12bd51ebb0a4db35dea382b1ebdc701bab224" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18 \ + file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \ + file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \ + file://0001-include-endian.h-for-htole32-and-friends.patch \ + file://0002-Remove-unused-include-for-execinfo.h.patch \ + file://0001-Remove-man-files-which-cant-be-built.patch \ + " +SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md From patchwork Wed Jun 13 06:35:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 138419 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp339108lji; Wed, 13 Jun 2018 00:01:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLsJf+sCK+XMGKDgEFcD8WtjPSfIV5ADy9hQ1LfLmZlZ001iYWwbi0jJ6MQuIZEW7EVSejb X-Received: by 2002:a63:7408:: with SMTP id p8-v6mr3054962pgc.275.1528873269565; Wed, 13 Jun 2018 00:01:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528873269; cv=none; d=google.com; s=arc-20160816; b=KxNxwaiSWANVEw5UYJT9HhqbUTc7EblSW2S1QvYUZHo82CnwQeTtMoinc0q1dB7B6E Rrf/IAt4fcn4qb6YwvN/2LpSjGsPGjMYZwtVrx9EyzKMLKUfI/5dKgtEKdognmMbcPYp QUaiNrZ/7Kwi74MQyLWtzkkwEVcUiwxtdWeus7EDbhEQE/YRRt6R5IpZJAmEP81wxyWM HDijQGBBDlqy91IhH4ODZFzNmS991R+A6vTiQ6IgxD0OUqw3RunGVH4nNHt0xzvifbgt OOq4UEBsoRQV4fEPTUKYykMIvrAKchc6DGFroCXnijr+nI8HJ4JWc0HtKQ4wkeXjmm7z FPRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=dkJuWdyhl3JM8teNwhb3Ntu8IKh+bUCFfsg+FYNTMTA=; b=hZsicxagbb9NIYiSvYCNW7jxM/AdnMP/eEg73NXft3JL+d6qZrBPwFW502OPwCMCjl qP78eLKFhOUyKjFTARQ/8mpsB0zb2FD3a2u2YTmvR7MkOtooGMeapi5soeCs0pw9uwyH C6AwfgyQDEwLLDwql5dDq0/2zb0vYyjymWU/IrT9aNClMnEHc7R2A1daK5N//CqElWru soUL0lD7JG16fogWRxOrcuLplT9J4NKMNIamp1dkBn7gML4HToyG3D9/+AmuQ70m3OwE jwoOWKwSoVHxMJ/Oqo+hy9w8Usga0HhDGyI4r9EnHZdAS7P+XpoVonRk/p9wE7N1IIEa tjNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ihybJSvu; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id i15-v6si1772326pgf.412.2018.06.13.00.01.09; Wed, 13 Jun 2018 00:01:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ihybJSvu; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E61A978E40; Wed, 13 Jun 2018 07:01:05 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f49.google.com (mail-pl0-f49.google.com [209.85.160.49]) by mail.openembedded.org (Postfix) with ESMTP id 023837901A for ; Wed, 13 Jun 2018 06:35:11 +0000 (UTC) Received: by mail-pl0-f49.google.com with SMTP id a7-v6so931912plp.3 for ; Tue, 12 Jun 2018 23:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YB2Rwz9JtgOOqaHU6Hjxa3VZb/ZLJyUqfsXW6LH5ihc=; b=ihybJSvusM+b9ond11k3tj0wRt+UTibfoHslKKtXFKGvwNYYhx8w98ZGucpNm6PVcn YfDRPBEY7eXm7vtkfpbtoAtnbMO34/77Ymu3PZp8p9o4kbCal4kV9m9lZ8QaVqXMhA5e Y4VfVDBWUxXT63oQRCGuM50P7e+mjekCIg6zjzqAkZ1Jym6TiHcGsMiHGMhxTY/6D8mP Ggp7Bjx+P3oAvVORUCY3C6AWPwHhVwofGIKtNvDkBm0cYuOfgvdGGbVR+FVEGZvaX+Cq 2lVJm1lAEH+99XZy4r1afyhA7zC1eC0dBQUXyOQRwVHk1aDW/CVRHm5kuYrWs0QddmfC rOBA== 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; bh=YB2Rwz9JtgOOqaHU6Hjxa3VZb/ZLJyUqfsXW6LH5ihc=; b=SRCqtgNNLO2woJL0MkiYTKr9uCqCFrtky9vNpf5muEd+atA1qFHYYJkzKoaxgFoBJE +H3ShbaYHQ1xIjl3UCskWY4r9MYfXI02UFg9AXommuRnfIYT8LwuH/0UyxFSIX1AF/bJ nLNORF65hYQc8a6siT3zApLXhRXnwVoOAs9KAPxHVx1W1NMZ0e1OdH42Wlx4Cx6MUtVv N7n5gMRy7YUd7HkJdOMeMDGgSPXOZICfUooHOPHcZCDWsIbX3ySTX2RokmJkqi51YZyO FgYOMA+RVXENcKqo78wZXELnP9Qv8bBiKWeGfg52wmt1q3u+ookqjTx+eNHd5D7y5AJT GnGQ== X-Gm-Message-State: APt69E2SznYR5VGLHyK08qfHqMLKJDNV+fdRPwVEctHUT9XfzouWM1EV tFLtanVMUzCdxlBNQu4xNuWGlg== X-Received: by 2002:a17:902:5945:: with SMTP id e5-v6mr1995826plj.64.1528871712723; Tue, 12 Jun 2018 23:35:12 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id b83-v6sm3525707pfe.159.2018.06.12.23.35.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 23:35:12 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 12 Jun 2018 23:35:09 -0700 Message-Id: <20180613063512.1755-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613063512.1755-1-raj.khem@gmail.com> References: <20180613063512.1755-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name() X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...eck-for-canonicalize_file_name-befor.patch | 64 +++++++++++++++++++ .../modemmanager/modemmanager_1.7.991.bb | 4 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch new file mode 100644 index 0000000000..256dd2ce0b --- /dev/null +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch @@ -0,0 +1,64 @@ +From 07f1eda630517816bfa900e811963745a149e57c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 8 Jun 2018 20:38:30 -0700 +Subject: [PATCH] Add configure check for canonicalize_file_name() before use + +Define canonicalize_file_name API if not provided by system C library +musl e.g. does not provide this API + +Signed-off-by: Khem Raj +--- + configure.ac | 2 ++ + src/kerneldevice/mm-kernel-device-generic.c | 18 ++++++++++++++++++ + 2 files changed, 20 insertions(+) + +Index: ModemManager-1.7.991/configure.ac +=================================================================== +--- ModemManager-1.7.991.orig/configure.ac ++++ ModemManager-1.7.991/configure.ac +@@ -72,6 +72,8 @@ AC_SUBST(MM_GLIB_LT_CURRENT) + AC_SUBST(MM_GLIB_LT_REVISION) + AC_SUBST(MM_GLIB_LT_AGE) + ++AC_CHECK_FUNCS([canonicalize_file_name]) ++ + dnl----------------------------------------------------------------------------- + dnl Documentation + dnl +Index: ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c +=================================================================== +--- ModemManager-1.7.991.orig/src/kerneldevice/mm-kernel-device-generic.c ++++ ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c +@@ -21,6 +21,7 @@ + #define _LIBMM_INSIDE_MM + #include + ++#include "config.h" + #include "mm-kernel-device-generic.h" + #include "mm-kernel-device-generic-rules.h" + #include "mm-log.h" +@@ -100,6 +101,24 @@ read_sysfs_property_as_string (const gch + return contents; + } + ++#ifndef HAVE_CANONICALIZE_FILE_NAME ++#include ++#include ++#include ++#include ++static char * canonicalize_file_name(const char *path) ++{ ++ char buf[PATH_MAX] = { }; ++ ++ snprintf(buf, sizeof(buf) - 1, "%s", path); ++ ++ if (!realpath(path, buf)) ++ return NULL; ++ ++ return strdup(buf); ++} ++#endif ++ + /*****************************************************************************/ + /* Load contents */ + diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb index b1a718dbfb..26b56d17d0 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb @@ -11,7 +11,9 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + file://0001-Add-configure-check-for-canonicalize_file_name-befor.patch \ + " SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f" SRC_URI[sha256sum] = "4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745" From patchwork Wed Jun 13 06:35:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 138420 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp339248lji; Wed, 13 Jun 2018 00:01:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIUfHcVUfbyEB/cd04GtTpaecvs9qnueKvljasDLKTXn1/SoKQ2cBg2Mz8GdDVdbJAu956M X-Received: by 2002:a62:40dc:: with SMTP id f89-v6mr3635483pfd.194.1528873277729; Wed, 13 Jun 2018 00:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528873277; cv=none; d=google.com; s=arc-20160816; b=w9CT/w3sTZp7ydhZIww1GfpDlLPWc4HZsw8Md7Gp4l9xUMqXynNk7xMl3kgYjCX3kh kOSkAOQyKm8u9vhdW2g7LDXZu0r7riGzP9L40eD3ih9kXtd1KQpFZeBF7SBuv/CO4NAp eobocG9AlYKIVRjKd62twEMHq+gL+OrD3XO49ConsXigBGHVrIMnuU1w/gqwVZSv7C/I sWNf6Vu+WhIh70XNIz/hs/t7zdpdAFFFb8iDKqC4FNSH2mtT3q/Cn7vvB44k4zmI17pN +CIeZh+IQdVXapW94ubHP+zYksU0ca99cAp2MQRqGBpK8YyRlCoDJ92G92w16spvi4wy Xq9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=66AeqBF3S2hinJaMM4GZobnkei8bmkzoYtAi5L0DUOU=; b=o4TUSHJm0SyVItaNnX8f5oUej6eanmgPdfxi863lLPMCD6XvxFzTwgJx0/2M+5a04z xThTE6vnTYS8ed6QFqHQ4DR4GYAgnO4ma06R42qxQnDbqhj6Xo6bFwF41/VmPEPeumIS nf6uBtDnm6UYLMRzRPA4kQ/Gi3NuhXuyc1f8/lfFagcnZHJIMTKytMFzL1CYScJAODvI 998QzQ406ogRF5+mEuakQ/HEdRhdDFaMY+vBpfctlfrNJCjXr8j4JfhX8mRT9vWGfkDF 7tu3lvFPnFI6wgZqWZr3fOLe4I6KfeS6M23cbz5uDnWc1ZOfR3Vo7ZzwdVqof4bW32f1 3xnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=U0v465XQ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x13-v6si1962379pfn.286.2018.06.13.00.01.17; Wed, 13 Jun 2018 00:01:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=U0v465XQ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 072D479095; Wed, 13 Jun 2018 07:01:07 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f46.google.com (mail-pl0-f46.google.com [209.85.160.46]) by mail.openembedded.org (Postfix) with ESMTP id 2E05F7450D for ; Wed, 13 Jun 2018 06:35:13 +0000 (UTC) Received: by mail-pl0-f46.google.com with SMTP id f1-v6so926730plt.6 for ; Tue, 12 Jun 2018 23:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+Bd7RKV6IrhNn0AexGKhf04ncgGOoHqlK0YWxS/uf2Y=; b=U0v465XQg9hH/vM5tf/w1bHrArv6DykhypQN47T07guXoanCIqZVfO+Dh6Yt9ihsqG u3rgQ9l7reb8kRIXrNMQ2habSp1Qv3tfqTHPBeMVDA5hsOofBAUYxCvTwL6rccyzHtIr aGHcPmUbLjzSyAp2MEQ8shtWQbOKZ2rNMpk+PWK+O6kVm4R0T5SKlOmqJJ87EBH3JRYL lFjlN7eqBuFsT8w9TDZLpCmMc7L3vB00sEmduNHGhBB/A/HY8PwXecZPKYbSNjdunRpF bdnE6wlWZRa2oIuN1MN5nVcwutmdrDeG0lvR2TPtJDgpg9xgomy2O/xQYN8MOr9i27Kn 3SOg== 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; bh=+Bd7RKV6IrhNn0AexGKhf04ncgGOoHqlK0YWxS/uf2Y=; b=i/hKPeyO1jAJitnnciuQHuGaYF2FrBXAnMXWJ7W1rKo6TFoVjuS7gLzuMk9UmEfn5n j5tMv6IYdK3wzmqfeDMgGzvllHIWgGwtfol8lLVrwhvg6DU3wBMJ0MJRrxU/iq2CXhWD HZRwhizsE/xuXxO5ie6d7hxKulzSin2w7qmzd6Lg/VGk39bkkZs8sTFRilSeTTH+GMKB 0+kF2J6tEDyRorieJQ0sIemsvngcdhBFs/CYPnEPZ9pbzHvlL3v0cJYF4X0WFVSAl6kA 7di87iMl1qwUOG/c4NTUT537wxewc9/18xHRKC0XLRk3pxu2Ew0S8Mb73dvvEgHsfjOo LSJw== X-Gm-Message-State: APt69E0e42g5woUEIemhDmmzI/+wV55E/4FyGQc6NZdbirQ3EegVNu7u royyyAS4Hna944S4g3bX0pEeMA== X-Received: by 2002:a17:902:264:: with SMTP id 91-v6mr3668351plc.341.1528871713963; Tue, 12 Jun 2018 23:35:13 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id b83-v6sm3525707pfe.159.2018.06.12.23.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 23:35:13 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 12 Jun 2018 23:35:10 -0700 Message-Id: <20180613063512.1755-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613063512.1755-1-raj.khem@gmail.com> References: <20180613063512.1755-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 3/5] celt051: Fix building testcases X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...tcode.c-into-test-sources-to-provide.patch | 55 +++++++++++++++++++ .../recipes-support/celt051/celt051_git.bb | 5 +- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch b/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch new file mode 100644 index 0000000000..cc893f0999 --- /dev/null +++ b/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch @@ -0,0 +1,55 @@ +From 61fbdddb660c5944ac23b820754a7c4cf4eee097 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 8 Jun 2018 19:29:03 -0700 +Subject: [PATCH] tests: Include entcode.c into test sources to provide + definitions of functions e.g. ec_ilog() + +Fixes link errors in tests +| /usr/src/debug/celt051/0.5.1.3+gitAUTOINC+5555aae843-r0/git/tests/../libcelt/rangedec.c:202: undefined reference to `ec_ilog' + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + tests/cwrs32-test.c | 1 + + tests/ectest.c | 2 +- + tests/laplace-test.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/cwrs32-test.c b/tests/cwrs32-test.c +index 3a95df2..a159ab3 100644 +--- a/tests/cwrs32-test.c ++++ b/tests/cwrs32-test.c +@@ -8,6 +8,7 @@ + #include "rangeenc.c" + #include "rangedec.c" + #include "cwrs.c" ++#include "entcode.c" + #include + #define NMAX (10) + #define MMAX (9) +diff --git a/tests/ectest.c b/tests/ectest.c +index aa35453..94eb9a3 100644 +--- a/tests/ectest.c ++++ b/tests/ectest.c +@@ -5,7 +5,7 @@ + #include + #include + #include +-#include "entcode.h" ++#include "entcode.c" + #include "entenc.c" + #include "entdec.c" + #include "rangeenc.c" +diff --git a/tests/laplace-test.c b/tests/laplace-test.c +index 3f98ab3..8e1fb4e 100644 +--- a/tests/laplace-test.c ++++ b/tests/laplace-test.c +@@ -6,6 +6,7 @@ + #include + #include "laplace.c" + #include "stack_alloc.h" ++#include "entcode.c" + #include "entenc.c" + #include "entdec.c" + #include "rangeenc.c" diff --git a/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-networking/recipes-support/celt051/celt051_git.bb index 850704f5af..116800522a 100644 --- a/meta-networking/recipes-support/celt051/celt051_git.bb +++ b/meta-networking/recipes-support/celt051/celt051_git.bb @@ -17,8 +17,9 @@ PV = "0.5.1.3+git${SRCPV}" SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" SRC_URI = "git://git.xiph.org/celt.git;branch=compat-v0.5.1;protocol=https \ - file://0001-configure.ac-make-tools-support-optional.patch \ -" + file://0001-configure.ac-make-tools-support-optional.patch \ + file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \ + " S = "${WORKDIR}/git" From patchwork Wed Jun 13 06:35:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 138421 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp339368lji; Wed, 13 Jun 2018 00:01:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKfTQmquUihcmW+NwZsnUXrybZz2HOM1eR7vvT1Nv5SDpjPNl6erwMDJ8Cwr7TrjrWkgMtq X-Received: by 2002:a17:902:1347:: with SMTP id r7-v6mr3935635ple.62.1528873286072; Wed, 13 Jun 2018 00:01:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528873286; cv=none; d=google.com; s=arc-20160816; b=wZ7mHEBQ5sQd1Yn+bIQLDPhLBPQAtmBYhvtHHBxO/EuPFGVhm1zReucah63A3YX1/b /ucdurmXi1ADo2akVUt+Q/HU6ModH1qRVKIzx/HAz8XXUzAmrIwrrzaW51Bdj6xcpiiA T+PfM4qmOzTDdZGYliA8JZln1bRjiU2qnhVn775PItRDhiK7U1E+/s5OsiIt1D9EsmNJ 0snFyY1w0XxoUhit1JfyG2yAsC4dH8Wa/cLLUxe01MhaXnwsMV7RdG97uC6xFAY5fORA 0F4muL5GrZRe9r66lrRItUcBy+IsW7xUWtZI4Mv04a8uuPNhcdeURq+N6TdZG1qb4WPr Qiqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=zFB/RJsRIflyunR7XDBrJ1VqJi+CGaP33MgRQo1OIzA=; b=CJ3MghiR0FZu0amhr+P6MOAuUZWZ2fzNv1rCVvjsnhsQ8h3JtXEyyQQdyZzhdJ4bqD erjp+RTGk/hTcf7FZfR12i0PoFVuVn6oaEZDYMzn5MQYkwrClANlpR/NnicD8GGxCyQf SpteTQSwhs2v3mHOpWFVL+HRivq+jwUwI17X1icRrepo8jG93qunw2RYS6AHxkvo+jk6 ZxAxvde6yH5QI+0M2eUDCLr2TEaJ7DbLSaBeP+KvtRKvehyVtY1i32acbSCZTpwyY7Tc SnOvXOmXsgUh1y69W3PzFauaTxzLWYw/r9JMx3GNIPu5hY6NMEyfe//E8aBE9g8QO/X/ wWhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=niHgpSRp; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f10-v6si1751638pgs.655.2018.06.13.00.01.25; Wed, 13 Jun 2018 00:01:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=niHgpSRp; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3A8597909D; Wed, 13 Jun 2018 07:01:08 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f46.google.com (mail-pl0-f46.google.com [209.85.160.46]) by mail.openembedded.org (Postfix) with ESMTP id 37A11790A2 for ; Wed, 13 Jun 2018 06:35:14 +0000 (UTC) Received: by mail-pl0-f46.google.com with SMTP id 31-v6so931583plc.4 for ; Tue, 12 Jun 2018 23:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BhScGGFT47MY1hx/oOmwXXxuGHzYTFueY2BHp1oQWkg=; b=niHgpSRpOXqbNnZ7QI+RY2ohyqdLnTKV8oPnTND0c90V70gxiWCPo9RlpKcH00IF4f Chy5HNc6VeBY/ugQmGpHnsY19nJrIW+gs8ijGnmzsySIRN8oVKhcPL/re574dRASv9PC w4ypUu8T0jBOO1pAd5Ex9/mOtOj0vee6OTDJOX0oCppamucbBOuXDiS019Y44pm42zT0 dcJqhn7mPjJE+obhEnePlIDQmxgvNJGlxv7sEQBW+sQ4e7dniQFfkiySfCByhgKFcnCI tMvV8hOIDp+Vy3JG9Zj59pSUZduPB92m3anPCyPpXe8lNXx3+yAehwmmH0CgJ2sCgzOs f3FA== 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; bh=BhScGGFT47MY1hx/oOmwXXxuGHzYTFueY2BHp1oQWkg=; b=MjcAqflhQqdltGH3RbxXGIjkD8lBljY+gEzOu6nC6w4Iob/Np8y1VVqg8OGQiFBZCO ocMhnSpvj3wFJEvcGXP5l6dR9KvvT77u2h4l+R+I+tALF1dq0IGEMvootrXp/+Wd7nVY AQjzY0EBDaDNN659R0EXeUSLsxGSwc8NwVAvjVE1P/hZRql144CrJo+pNNhcqArwrsbl CjLHHxtCQg78rjIfAB7o+JOUxsVL3v9S3y0LuWHFCQAAn48F2Os/u8dDmblEzjZEQpgg So0Sncrk9U7I66XtoJaS5yxImtLP6TXJaH4uGKSmP/DZIZw1XP4JsRevhKff4oGZXlDn pK1A== X-Gm-Message-State: APt69E2B3EJPgMV8h2hdesGJEIpWEffrLTfAykcLICVRIrBT/P5upEJO 1atxx9BoyfjRoOd18xSl3MdCsg== X-Received: by 2002:a17:902:563:: with SMTP id 90-v6mr3739328plf.327.1528871715131; Tue, 12 Jun 2018 23:35:15 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id b83-v6sm3525707pfe.159.2018.06.12.23.35.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 23:35:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 12 Jun 2018 23:35:11 -0700 Message-Id: <20180613063512.1755-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613063512.1755-1-raj.khem@gmail.com> References: <20180613063512.1755-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-disable-more-Werror-warnings.patch | 48 +++++++++++++++++++ .../recipes-support/cpprest/cpprest_2.10.2.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch new file mode 100644 index 0000000000..febfd5bc96 --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch @@ -0,0 +1,48 @@ +From ee92f84a96a507b0a7a3c54929ce190ee28b4ecd Mon Sep 17 00:00:00 2001 +From: Alexander Moriarty +Date: Wed, 6 Jun 2018 10:38:43 -0700 +Subject: [PATCH] disable more -Werror warnings + +gcc-8: -Wno-format-truncation + +clang-6: -Wdelete-non-virtual-dtor +clang-6: -Wunused-lambda-capture + +removed duplicated: -Wno-reorder + +This fixes #778 + +Upstream-Status: Pending [https://github.com/Microsoft/cpprestsdk/pull/779] +Signed-off-by: Khem Raj +--- + Release/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt +index 1267aff1..fb291ccd 100644 +--- a/Release/CMakeLists.txt ++++ b/Release/CMakeLists.txt +@@ -166,12 +166,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-pointer-arith") + elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") + set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls) +- set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs) ++ set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture) + set(WARNINGS ${WARNINGS} ${LINUX_SUPPRESSIONS}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration") + else() + set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls) +- set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs) ++ set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture) + set(WARNINGS ${WARNINGS} ${OSX_SUPPRESSIONS}) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration") +@@ -184,7 +184,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS) + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + message("-- Setting gcc options") + +- set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code) ++ set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code -Wno-format-truncation) + set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs") + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing") diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb index 1dbe093bee..fea5d4b2eb 100644 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb @@ -9,6 +9,7 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://fix-cmake-install.patch \ file://0001-Fix-a-build-problem-on-Clang.patch;patchdir=.. \ file://0002-Define-virtual-destructor.patch;patchdir=.. \ + file://0001-disable-more-Werror-warnings.patch;patchdir=.. \ " # tag 2.10.2 From patchwork Wed Jun 13 06:35:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 138422 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp339552lji; Wed, 13 Jun 2018 00:01:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK+VXibtdJAO+UR77h/Iy2Mj8GwRIuWtc/LHsKrBOuNIbMMBRTgYFMGipTO7conbSX5gkEo X-Received: by 2002:a63:583:: with SMTP id 125-v6mr2970671pgf.385.1528873294799; Wed, 13 Jun 2018 00:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528873294; cv=none; d=google.com; s=arc-20160816; b=qQr7aV5k/Pd0jMQl0vZou8CPuIRjzmYW401iB8jlcO2tTgEfJ8XL7ihXYRVfEjd4Mb oWeOcpGD2WLdjydcD3ulRbATZUVtIRdD72Eywj9W1boy7FJroExksiCrg7VMr7vxt8wo Kt39vGfmBnvAvQk4p9Wy+Ut33U9eVNYut4BpAp4pJjv8CEDd9TRs2jUhS23it9yaAG+p /eWZb0BHW+z5qSE0n4lJI3ZB+fXoOPyyp2QJ+UK8Tv7PlvyZ6GW6KW1nnQ6UqbmRGZny eh014vtk0agFsyylr4m75tuSL7eVk6LlNypgshhULtCOjjmUhpjv6Esn7X+vX4zHu49R /l1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=pYzzMYiGvqC0KfAPzTN802LSdDOpKez6s6wMQP652iQ=; b=fMV1P0mHgSsnxkKg2AWC5r/V2gFgzbZ6htXBuhrFbHxguDaV8FSY70EskJgb4zBPFM Bw4yZGFVAbJU3Z/d7tSxjuW0P1yRPF5M7POPoV8uZVbqdBlL5D908FNGAypcLC0IzSNx 9P+zQEEDlwLhQAt6+iBbuEPwHJSgYLxqUA1e60R1zUg7VSTtrSXUGyJZp9fyx0ud4tZp lfdgmW/IqXp6wJeznr+kLUZjNIlhNP44wMbGy+qMUbhNwZbFf0Zo5wihZFa1TJEb17hi LsJOFXWrZedhhh+/SVoTdCCtyTvplvVjThNrXOaaSpKZOcDeAh+eZkHdhQOfSymHjq87 HeUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=s58iOpc1; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j195-v6si1708036pgc.543.2018.06.13.00.01.34; Wed, 13 Jun 2018 00:01:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=s58iOpc1; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0C3C4789B5; Wed, 13 Jun 2018 07:01:14 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by mail.openembedded.org (Postfix) with ESMTP id C48467450D for ; Wed, 13 Jun 2018 06:35:15 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id 6-v6so382512plb.0 for ; Tue, 12 Jun 2018 23:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=em5iKpDQBcYBS+s6MBt/hbPn/4hc5wG0Gn5chDY+9go=; b=s58iOpc1IgwCm0YhPuNBt2SinMEcLv5IAwLVoToEjlMYA94vUsz/5b3NLqzl8qywVC uzcoc8MKYH0EEIh6pqwnUuYiZthj+zsoIk0kRABk8Ek5Izsfo7a4cjH61HoX/WiJKaDU AJJ1I2MP38vOfyVCNPG6nIlJJBPO6HiKPMY4XZ0ib/sld6UpK2T4FFRCd0TAMcSos1ew RPPxRhmk9/NjNtSs7vz51RNcnr1fzrmy7HygXQItj8S28wmIPUTHb3Wa5pUmVIgNtbMF XnOZacEQWs1YzzhGP8feQML2EXxN4fkfcAV1yqE4dwO0YP4Xguc4Zca7ygyuxfIFPRR8 3a9A== 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; bh=em5iKpDQBcYBS+s6MBt/hbPn/4hc5wG0Gn5chDY+9go=; b=edINJua4fHRCLOB2nWet84qBdURsbtZ4Vb8QNHwpmq/QRLgGD2aqvf2kLFzd9xEJv1 WH8UkeA7l22DDrBLDP8qkejPGsmtUCoUhuuuec3Z64QXATWmqRtNKIAxGFxmqTYndOzG UV0qg9f7+zdqoSfFnQiCcISZCeNj2oQQl9ZvsvRY8uhylyK1cpVjmgtLK8GIA2JRgkuP kcBLogSmKN4TYUZmXogD66pTMV7LXtQdMjy1E5P1Z8xYp3PcJx8GqPTiW7mVX08F22Sc 1E9H+1Wu8sT34NCJndXhHpDbJNyUgjz2pmI/hE8fTlUZMN4wxCzKTSl1mABCNfpZWwHS WYjw== X-Gm-Message-State: APt69E1AhW/H7rlw203+nynYHSqtiMhpi9ZoGpO0TZnn9K6PkYIsJzCk cRHFXzofOsQEOGqbVDItU4LVsQ== X-Received: by 2002:a17:902:b28c:: with SMTP id u12-v6mr3744523plr.68.1528871716365; Tue, 12 Jun 2018 23:35:16 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id b83-v6sm3525707pfe.159.2018.06.12.23.35.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 23:35:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 12 Jun 2018 23:35:12 -0700 Message-Id: <20180613063512.1755-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613063512.1755-1-raj.khem@gmail.com> References: <20180613063512.1755-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 5/5] wireshark: Update to 2.6 release X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Add a native version to provide certain utilities needed during cross build Strip rpaths which cmake seems to be enforcing for no reason Signed-off-by: Khem Raj --- .../wireshark/files/libgcrypt.patch | 53 ------------ .../0001-Add-libm-to-link-for-fmod-API.patch | 29 +++++++ .../wireshark/wireshark_2.4.6.bb | 73 ----------------- .../wireshark/wireshark_2.6.1.bb | 80 +++++++++++++++++++ 4 files changed, 109 insertions(+), 126 deletions(-) delete mode 100644 meta-networking/recipes-support/wireshark/files/libgcrypt.patch create mode 100644 meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch delete mode 100644 meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb create mode 100644 meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/wireshark/files/libgcrypt.patch b/meta-networking/recipes-support/wireshark/files/libgcrypt.patch deleted file mode 100644 index 2aa58f73c2..0000000000 --- a/meta-networking/recipes-support/wireshark/files/libgcrypt.patch +++ /dev/null @@ -1,53 +0,0 @@ -use OR PKG_CONFIG scheme for libgcrypt - -Upstream-Status: Inappropriate OE specific - -Signed-off-by: Armin Kuster - -Index: wireshark-2.4.4/m4/libgcrypt.m4 -=================================================================== ---- wireshark-2.4.4.orig/m4/libgcrypt.m4 -+++ wireshark-2.4.4/m4/libgcrypt.m4 -@@ -27,11 +27,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then -- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config -+ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/libgcrypt.pc - fi - fi - -- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) -+ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt.pc, no) - tmp=ifelse([$1], ,1:1.2.0,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -50,7 +50,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` -+ libgcrypt_config_version=`$PKG_CONFIG --modversion libgcrypt` - major=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ -@@ -82,7 +82,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], - # If we have a recent libgcrypt, we should also check that the - # API is compatible - if test "$req_libgcrypt_api" -gt 0 ; then -- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` -+ tmp=`$PKG_CONFIG --api-version libgcrypt 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - AC_MSG_CHECKING([LIBGCRYPT API version]) - if test "$req_libgcrypt_api" -eq "$tmp" ; then -@@ -95,8 +95,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], - fi - fi - if test $ok = yes; then -- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` -+ LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt` -+ LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt` - ifelse([$2], , :, [$2]) - else - LIBGCRYPT_CFLAGS="" diff --git a/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch b/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch new file mode 100644 index 0000000000..e65ef9b10c --- /dev/null +++ b/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch @@ -0,0 +1,29 @@ +From 1a6a5d2bcb1adec9ba138c2ebee7bbc994620aff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Jun 2018 23:23:44 -0700 +Subject: [PATCH] Add libm to link for fmod() API + +fixes +ld: CMakeFiles/tshark.dir/ui/cli/tap-comparestat.c.o: undefined reference to symbol 'fmod@@GLIBC_2.2.5' +| /mnt/a/oe/build/tmp/work/core2-64-bec-linux/wireshark/1_2.6.1-r0/recipe-sysroot/lib/libm.so.6: error adding symbols: DSO missing from command line + +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7950e85..acee140 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2494,6 +2494,7 @@ if(BUILD_tshark) + ${LIBEPAN_LIBS} + ${APPLE_CORE_FOUNDATION_LIBRARY} + ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ++ m + ) + set(tshark_FILES + capture_opts.c +-- +2.17.1 + diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb b/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb deleted file mode 100644 index 3da0a7bafc..0000000000 --- a/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb +++ /dev/null @@ -1,73 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" - -DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error" - -SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz" -SRC_URI += "file://libgcrypt.patch" - -UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" - -SRC_URI[md5sum] = "8cfb73e286dd6427ca4405e6e802d13e" -SRC_URI[sha256sum] = "8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe" - -PE = "1" - -inherit autotools pkgconfig perlnative upstream-version-is-even - -ARM_INSTRUCTION_SET = "arm" - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" - -PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}/usr, --with-libcap=no --enable-pcap-ng-default , libcap" -PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_DIR_HOST}/usr --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" -PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" -PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" -PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" -PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" -PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" -PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," -PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" -PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" -PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" -PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" -PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" -PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" -PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" -PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc" -PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_DIR_HOST}/usr, --with-libssh=no, libssh2" -PACKAGECONFIG[lz4] = "--with-lz4=${STAGING_DIR_HOST}/usr, --with-lz4=no, lz4" - -# these next two options require addional layers -PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" - -EXTRA_OECONF += "--with-libgcrypt-prefix=${PKG_CONFIG_DIR} --with-qt=no --enable-tshark --enable-rawshark" - -LDFLAGS_append = " -lgpg-error" - -# Currently wireshark does not install header files -do_install_append () { - - install -d ${D}/${includedir}/${BPN} - install -d ${D}/${includedir}/${BPN}/epan - install -d ${D}/${includedir}/${BPN}/epan/crypt - install -d ${D}/${includedir}/${BPN}/epan/dfilter - install -d ${D}/${includedir}/${BPN}/epan/dissectors - install -d ${D}/${includedir}/${BPN}/epan/ftypes - install -d ${D}/${includedir}/${BPN}/epan/wmem - - install config.h ${D}/${includedir}/${BPN} - install ${S}/register.h ${D}/${includedir}/${BPN} - install -D ${S}/epan/*.h ${D}/${includedir}/${BPN}/epan - install -D ${S}/epan/crypt/*.h ${D}/${includedir}/${BPN}/epan/crypt - install -D ${S}/epan/dfilter/*.h ${D}/${includedir}/${BPN}/epan/dfilter - install -D ${S}/epan/dissectors/*.h ${D}/${includedir}/${BPN}/epan/dissectors - install -D ${S}/epan/ftypes/*.h ${D}/${includedir}/${BPN}/epan/ftypes - install -D ${S}/epan/wmem/*.h ${D}/${includedir}/${BPN}/epan/wmem -} - -FILES_${PN} += "${datadir}*" diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb new file mode 100644 index 0000000000..91c5e96bb0 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb @@ -0,0 +1,80 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" + +DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2" + +DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " + +SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz \ + file://0001-Add-libm-to-link-for-fmod-API.patch \ + " + +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[md5sum] = "b0e9e5fe22e96d9fdfad18f750fa8f55" +SRC_URI[sha256sum] = "ab6e5bbc3464c956347b8671ce8397950ad5daff3bf9964c967d495f4ddbcd88" + +PE = "1" + +inherit cmake pkgconfig pythonnative perlnative upstream-version-is-even + +ARM_INSTRUCTION_SET = "arm" + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" +PACKAGECONFIG_append_class-target = " ${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk3 graphics ", "", d)}" + +PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" + +PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" +PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" +PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" +PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" +PACKAGECONFIG[gtk2] = "-DENABLE_GTK=ON,-DENABLE_GTK=OFF, gtk+" +PACKAGECONFIG[gtk3] = "-DENABLE_GTK3=ON,-DENABLE_GTK3=OFF, gtk+3" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qtbase" +PACKAGECONFIG[graphics] = ",-DENABLE_GTK=OFF," +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" +PACKAGECONFIG[ssl] = ",,openssl" +PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" +PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" +PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" +PACKAGECONFIG[geoip] = ",, geoip" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" +PACKAGECONFIG[libssh] = ",,libssh2" +PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" + +# these next two options require addional layers +PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" + +EXTRA_OECMAKE += "-DBUILD_wireshark=ON \ + -DENABLE_NETLINK=ON \ + -DBUILD_mmdbresolve=OFF \ + -DBUILD_randpktdump=OFF \ + -DBUILD_androiddump=OFF \ + -DBUILD_dcerpcidl2wrs=OFF \ + -DM_INCLUDE_DIR=${includedir} \ + -DM_LIBRARY=${libdir} \ + " +do_install_append_class-native() { + install -d ${D}${bindir} + for f in make-dissectors lemon make-taps + do + install -m 0755 ${B}/run/$f ${D}${bindir} + done +} + +do_install_append_class-target() { + for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` + do + chrpath --delete $f + done +} + +FILES_${PN} += "${datadir}*" + +BBCLASSEXTEND = "native"