From patchwork Tue Jan 31 01:51:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99850C63797 for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.2805.1675129924315990764 for ; Mon, 30 Jan 2023 17:52:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jEd6hEuy; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id v23so13597656plo.1 for ; Mon, 30 Jan 2023 17:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/d4U4hyYz3XRLqM47aLor6IgViFrFvo6TIiSckujmj4=; b=jEd6hEuy1+D80GlkmO1jRkM/OIT0x4HuyH4BjEy69/gk6ISIZMbWsRyyBzPwsAqoAs N2LqTw85W4sGKvjq00a39nRsLIfaeg7IOziizvMorB6UNnV95wQ+3p3ssw7pFEHQbTOV wbYNbT9EDJRzYCiyvI6gqe+42N9yVRs8bAkYlA6dynDNdvhgcIbpi9Xhs4BdsHqMe3by +jZv5hrmyoM//MgZQhaQAiwa4pxUqx9pvPKVSrDFJDZzVqUErIZ5XSpwbfZbPsjuuw04 LhiqkC/2pcPencb5mduQ4Add1MiwnI3O4eXj2RqHQ0zEj5xiIkMgHf9Lcraek9v8inf5 ixCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/d4U4hyYz3XRLqM47aLor6IgViFrFvo6TIiSckujmj4=; b=lyu3+rOScgu5O8qiNSjSg55wXZOsMDHd87oqJDubDTGRZZFckkOKA5rBRSdFy5aqJA +Ec2zvK3McJXPc1T09zkm16sbwwxWqn4fiZ/oaDUl4AMlvD+3yl/0yKD2da/hUu3W5X4 fQqLAzUU5/OUeRTmvGN+dbFOm3N6dnnIaQwn++7W7Mz/yUAgPrFV89YP0VN5WdGdzll2 qqx0XuWnniwWoomFvcV5porRu97t0tS/bYeA3mOln28ujgYTRrozMNgMi+UPwIsSIKJ9 cPeERczepDak1LYYnOzllOwhG0q3TtYw4+fAcYAfe4u/3iqL5r3/SqBkuDXr/9OT5Tvu AHzQ== X-Gm-Message-State: AFqh2kryUATTAvme6dT/ZiXdsoexcWR1CwpZ8Ra6JkPCLHboO3f3Hw8I ejfCRYDV7fOR8cSacZur9/YDrJT8DtcMzg== X-Google-Smtp-Source: AMrXdXtdTve6oai6yR8UcoahfH0dDoGh38NVRL99SSeG1HnopkMXJVTPD1eYgtSKb38atUiCrLh3TQ== X-Received: by 2002:a17:90a:4587:b0:229:bc1:7cd1 with SMTP id v7-20020a17090a458700b002290bc17cd1mr55623634pjg.33.1675129923069; Mon, 30 Jan 2023 17:52:03 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:02 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/8] zeromq: Fix build with gcc13 Date: Mon, 30 Jan 2023 17:51:53 -0800 Message-Id: <20230131015200.3862532-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100862 Signed-off-by: Khem Raj --- ...cator.hpp-define-missing-rebind-type.patch | 64 +++++++++++++++++++ .../zeromq/zeromq_4.3.4.bb | 1 + 2 files changed, 65 insertions(+) create mode 100644 meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch diff --git a/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch b/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch new file mode 100644 index 0000000000..d32190818b --- /dev/null +++ b/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch @@ -0,0 +1,64 @@ +From 66e72389cc90625ed74e8ba1ea3a65234bdb06b5 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 20 Dec 2022 21:45:16 +0000 +Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type + +`gcc-13` added an assert to standard headers to make sure custom +allocators have intended implementation of rebind type instead +of inherited rebind. gcc change: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 + +Without the fix build fails on this week's `gcc-13` as: + + [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o + In file included from /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, + from /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64, + from /<>/gcc-13.0.0/include/c++/13.0.0/memory:69, + from tests/../src/secure_allocator.hpp:42, + from tests/../src/curve_client_tools.hpp:49, + from tests/test_security_curve.cpp:53: + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind, unsigned char, void>': + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t; _Up = unsigned char]' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template template using std::allocator_traits< >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t]' + /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits, unsigned char>::rebind' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base >' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector >' + tests/../src/curve_client_tools.hpp:64:76: required from here + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits::rebind_alloc must be A + 70 | _Tp>::value, + | ^~~~~ + +The change adds trivial `rebind` definition with expected return type +and satisfies conversion requirements. + +Upstream-Status: Backport [https://github.com/zeromq/libzmq/commit/438d5d88] +Signed-off-by: Khem Raj +--- + src/secure_allocator.hpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp +index 0d37e7ed..5b8de9e2 100644 +--- a/src/secure_allocator.hpp ++++ b/src/secure_allocator.hpp +@@ -95,6 +95,17 @@ bool operator!= (const secure_allocator_t &, const secure_allocator_t &) + #else + template struct secure_allocator_t : std::allocator + { ++ secure_allocator_t () ZMQ_DEFAULT; ++ ++ template ++ secure_allocator_t (const secure_allocator_t &) ZMQ_NOEXCEPT ++ { ++ } ++ ++ template struct rebind ++ { ++ typedef secure_allocator_t other; ++ }; + }; + #endif + } +-- +2.39.1 + diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb index 697bc47137..bf25d56ee9 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb @@ -8,6 +8,7 @@ PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ + file://0001-src-secure_allocator.hpp-define-missing-rebind-type.patch \ file://run-ptest \ " SRC_URI[md5sum] = "c897d4005a3f0b8276b00b7921412379" From patchwork Tue Jan 31 01:51:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18830 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8DC2C6379F for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.2765.1675129924694740910 for ; Mon, 30 Jan 2023 17:52:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kIK10ypJ; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id z1so6049041plg.6 for ; Mon, 30 Jan 2023 17:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HITAxCK/6N1y04tYRd25Zr7xKUAq6Xbvjv0rB6lMQyc=; b=kIK10ypJMGF9JhWZtXUMaPMqbBtwdfJ7vvqs8+pLyrOSKxLlvuYh6h0v5NsVTw6eF3 ShiBL+6ZW3kITvfLW3dWR/0ohBRUrX9YfpduVKd6VqKZBgBRwllgZBwAWCf0y5f9+pBo xhzoAYCcWsY0jQ5jXILWcd8SPp5t6wyLLsgrpOGa43+KmI7e9IMMBjdDoCTgi16ASDNp h7ec8D/lwedYCd9tM2uDb/eTzJ+0MJru/ejveWiFZVp/DXkNPOikuZqIgB1c0KCTqHkL EYyfIOpsaE2R+mD+b1rzSTCXKV93y1ym+JO0md9r6EBAT4iyS006edEYQCsxC6raYyV1 otyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HITAxCK/6N1y04tYRd25Zr7xKUAq6Xbvjv0rB6lMQyc=; b=q7/GknoaFpVlrk2Zqwgk+RGcSZFS1+62fq8D/9CnaCo8plgnMBeIyAJHcUe6wtuYLd maPtctvliso63jTHGccEdg03jTjJtp2FdQa9FAVfBA6iO2z+wfeT41cO9r5aWw7mEOW6 h7tir8TFxNlqOBiMzXs2/wrJIwIq2vOj1Btl8tZADgUWcVPJ3+mmRMOM6MAUBt0wUl+z lGMnN26fz4mEFkX0XjUG0L6p/SeRodKlD7N72V+eDjS4/6yE4RzeKfXKKzOaGnijVJrR XFxiAEoPseJXvl2Yk8cm8tbP8/RN76B87dH5W4ko608Hz8D35lqkNLIIbU4wM7C2f78G b9eA== X-Gm-Message-State: AO0yUKUmNoqZOqopJJCv+86HWKMribohX4zm0hZQMs/vzi00CeteZSqL zInGuR4j/9JAtaibZCt4ffncJAAMZZagWg== X-Google-Smtp-Source: AK7set/KLT4BRXNmBswoEA2KCzP0TE5/WzSoeIqHnyirQJCJcPx4xE19bIkm6WUUHLOmq19THTNFWQ== X-Received: by 2002:a17:90b:4f87:b0:22c:5653:4d2f with SMTP id qe7-20020a17090b4f8700b0022c56534d2fmr11565526pjb.8.1675129923820; Mon, 30 Jan 2023 17:52:03 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:03 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 2/8] python3-greenlet: Fix build with gcc13 Date: Mon, 30 Jan 2023 17:51:54 -0800 Message-Id: <20230131015200.3862532-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131015200.3862532-1-raj.khem@gmail.com> References: <20230131015200.3862532-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100863 Signed-off-by: Khem Raj --- ...Allocator-define-missing-rebind-type.patch | 56 +++++++++++++++++++ .../python/python3-greenlet_2.0.1.bb | 3 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch diff --git a/meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch b/meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch new file mode 100644 index 0000000000..01092025de --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch @@ -0,0 +1,56 @@ +From 18fb84bb041072503b783ae03c5252f26d2216b8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 29 Jan 2023 21:42:08 -0800 +Subject: [PATCH] PythonAllocator: define missing 'rebind' type + +`gcc-13` added an assert to standard headers to make sure custom +allocators have intended implementation of rebind type instead +of inherited rebind. gcc change: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 + +Without the fix build fails on this week's `gcc-13` as: + +| In file included from ../recipe-sysroot/usr/include/c++/13.0.1/ext/alloc_traits.h:34, +| from ../recipe-sysroot/usr/include/c++/13.0.1/bits/basic_string.h:39, +| from ../recipe-sysroot/usr/include/c++/13.0.1/string:54, +| from src/greenlet/greenlet.cpp:10: +| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind, _greenlet*, void>': +| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:94:11: required by substitution of 'template using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = greenlet::PythonAllocator<_greenlet*>; _Up = _greenlet*]' +| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:228:8: required by substitution of 'template template using std::allocator_traits< >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = _greenlet*; _Alloc = greenlet::PythonAllocator<_greenlet*>]' +| ../recipe-sysroot/usr/include/c++/13.0.1/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits, _greenlet*>::rebind<_greenlet*>' +| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<_greenlet*, greenlet::PythonAllocator<_greenlet*> >' +| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:423:11: required from 'class std::vector<_greenlet*, greenlet::PythonAllocator<_greenlet*> >' +| src/greenlet/greenlet_thread_state.hpp:115:16: required from here +| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits::rebind_alloc must be A +| 70 | _Tp>::value, +| | ^~~~~ +| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:70:31: note: 'std::integral_constant::value' evaluates to false + +The change adds trivial `rebind` definition with expected return type +and satisfies conversion requirements. + +Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/344] +Signed-off-by: Khem Raj +--- + src/greenlet/greenlet_allocator.hpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/greenlet/greenlet_allocator.hpp b/src/greenlet/greenlet_allocator.hpp +index 666307d..beaa7ed 100644 +--- a/src/greenlet/greenlet_allocator.hpp ++++ b/src/greenlet/greenlet_allocator.hpp +@@ -32,6 +32,11 @@ namespace greenlet + + PythonAllocator() : std::allocator() {} + ++ template struct rebind ++ { ++ typedef PythonAllocator other; ++ }; ++ + T* allocate(size_t number_objects, const void* UNUSED(hint)=0) + { + void* p; +-- +2.39.1 + diff --git a/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb b/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb index 4a50a24184..90b5d140d5 100644 --- a/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb @@ -4,7 +4,8 @@ LICENSE = "MIT & PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" -SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch" +SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch \ + file://0001-PythonAllocator-define-missing-rebind-type.patch" SRC_URI[sha256sum] = "42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67" From patchwork Tue Jan 31 01:51:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18831 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3F3BC64EC3 for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.2806.1675129925554630094 for ; Mon, 30 Jan 2023 17:52:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Hmb7pn+A; spf=pass (domain: gmail.com, ip: 209.85.214.174, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f174.google.com with SMTP id b5so6335764plz.5 for ; Mon, 30 Jan 2023 17:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gNlyTgkXOTyOHNaNDiRIaQsnpuM6WdXqqyCyWZp3wtQ=; b=Hmb7pn+AgOxOmrolRe+YURQntFtQRwQx1GQWGuimJn0U/BmjinGPtQEk66Xw1WJW8O bTXHfzAvOGvk8R5i0/cyOssmI6H5nIQ4JS3ZJjhxP0hVZ6zwiG9F5wXPoRd68JH+Zz8v W7/aZfngzZzSHUtOdPSgp1UWnzy0qhuIpSj0/udJENCMSKLYwgwWHTPkkV6+zq9SUQRe TQ/r0dz5jraCihHsNM21k8cm3ydms1+yu0/woqkVmPkL1lqnZcWp4UNd9eSpHYrR3E4Z zt1fsLRhf+zzq7JBFLkJ63rhq7zBOeOIUPFE2BBkcqWPC+T44BnUNfZZpGm6jVEmAbxi cUrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gNlyTgkXOTyOHNaNDiRIaQsnpuM6WdXqqyCyWZp3wtQ=; b=358C8OzMJ+r33WhvOPm++RLa4yQyQnogy6Su7TY1oQsXYGBm55PRNqCECH9ZP1kBoJ HgNQDoaIUDe5HSXmXqeMhQGQOeYy1jytfj75ppQgGdRx0wSayMno2ezQjWV71Fdgrzrr +MRhkfmFIIXUUhRgON/cpZ91nme0Qj1KTWziEabVLPIy3TBli8uVR8zC6SC+o4E+3tCL qNahizr4912N7BT5IBBks8XrhfPfiOSR79kupRdieCE972ZElBGsRvJiquZ2mNGXR0K2 9tmDuUXKAfPWekdCXBdVOVrio/MM8O++ZqpT0GNuzPJasxqOxe6F7xp5q1RlRD0xbm2M HCDg== X-Gm-Message-State: AO0yUKVEy1Cr6xvkam8/+IUNTooOYwC4GfS94oLHROuAEteewQTiCey5 UgC3ocxTVLFa5k0R5jgRJcSu5GZ+GSGmJA== X-Google-Smtp-Source: AK7set9wgD+aOKtcVc7oeZGAG2Kq1sk6Y+k9N8+AY5Uq7I96Q8pVarEBTcXC6QyGDFAk/rQOv27RoQ== X-Received: by 2002:a17:90b:384a:b0:22c:198:6d73 with SMTP id nl10-20020a17090b384a00b0022c01986d73mr24711547pjb.8.1675129924688; Mon, 30 Jan 2023 17:52:04 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:04 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/8] perfetto: Upgrade to 31.0 release Date: Mon, 30 Jan 2023 17:51:55 -0800 Message-Id: <20230131015200.3862532-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131015200.3862532-1-raj.khem@gmail.com> References: <20230131015200.3862532-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100864 Forward port pc file patch to 0.31 release Signed-off-by: Khem Raj --- ...1-meson-add-pc-file-for-lib_perfetto.patch | 25 ++++++++----------- .../recipes-devtools/perfetto/perfetto.inc | 4 +-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch index 70de44173d..21033eaaa8 100644 --- a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch +++ b/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch @@ -7,17 +7,15 @@ Subject: [PATCH] meson: add PC file for lib_perfetto meson.build | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -diff --git a/meson.build b/meson.build -index 06015141c..752b4d928 100644 --- a/meson.build +++ b/meson.build @@ -19,9 +19,12 @@ project( 'perfetto', - ['c','cpp'], -- default_options: ['c_std=c99', 'cpp_std=c++11'] -+ default_options: ['c_std=c99', 'cpp_std=c++11'], -+ version: '27.1' + ['cpp'], +- default_options: ['cpp_std=c++17'] ++ default_options: ['cpp_std=c++17'], ++ version: '31.0' ) +soversion = meson.project_version() @@ -25,20 +23,20 @@ index 06015141c..752b4d928 100644 fs = import('fs') if not fs.is_dir('sdk') -@@ -30,8 +33,9 @@ endif - - dep_threads = dependency('threads') +@@ -36,8 +39,9 @@ if host_machine.system() == 'android' + deps_perfetto += cpp.find_library('log') + endif -lib_perfetto = static_library( +lib_perfetto = shared_library( 'perfetto', + version: soversion, sources: 'sdk/perfetto.cc', - dependencies: dep_threads, + dependencies: deps_perfetto, install: true, -@@ -39,6 +43,10 @@ lib_perfetto = static_library( +@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu - inc_perfetto = include_directories('sdk') + install_data(dir_perfetto_trace / 'perfetto_trace.proto') +install_headers('sdk/perfetto.h') +pkg = import('pkgconfig') @@ -47,6 +45,3 @@ index 06015141c..752b4d928 100644 dep_perfetto = declare_dependency( link_with: lib_perfetto, include_directories: inc_perfetto, --- -2.34.1 - diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc index 5cb6f8bb34..de871d4f3d 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.inc +++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/google/perfetto" SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1" -SRCREV_perfetto = "1c52b5e132312aeb007ed180d4ba1d8d66227923" -PV = "27.1" +SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5" +PV = "31.0" S = "${WORKDIR}/git" From patchwork Tue Jan 31 01:51:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18828 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97AAAC61DA4 for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.2767.1675129926634233224 for ; Mon, 30 Jan 2023 17:52:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aoQNMoGH; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id jh15so4537756plb.8 for ; Mon, 30 Jan 2023 17:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=meeEXZgJQHrx2HSu3AEr7bOe2AGNNjaozD4XqyKSSQM=; b=aoQNMoGHvsA4RlCf7WanKlJI8GovpwQD92Y9dmaQ2bba1gGt0qmRA/L3XKpk+kl7bo Or0lxNH2Oma3PDb/OhoJTFtiRBDQhi8gaTrLT4jnvkgbpI+ms3FUB9ScuNteu+OpbrrP lLGYrFOmsl/Chdm9oSJW3FgUuVETc26blirZA3meahY2Bq0Wa8eCq+OexvtN2iuOuo6n e7EF7y0QZCFqjGvmuKp/d+ZeA9IoayGO7N5E7G101+k6E79yglfP+s8JJD/4XJATEtuH 1Z26u6sb6eg2QRgf6KH8OqQcoxyxCeGw8+wIJnIsmhA5LdLU+bBOmSapKntGbCxA50tN MJDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=meeEXZgJQHrx2HSu3AEr7bOe2AGNNjaozD4XqyKSSQM=; b=KWo3NGdwzNse8mQrBT13mD2t/3c8wbtOd5KXxvznhYxjBLHs+klaNIp2OBQRfmAVtu 21nbubFRF29IrWdYra8Jf0NPAXO4zgX+P9dtGWaj/TBwp3wYiKXams3LwALm57rTgYZB m3msW9GpGimeDN5YI5bnc3BmjsDDgY1TeILjlxRphyeo5LHClyJn8JlRmHVreAB3zAfI oQtzxzfHwBo5agqAre8ChPYkM8Q9qhijWIfZv6kXK/yN+KH5TPqU3VJIK5vTeVTibGDX Xz5r7/LIN/mtxX2pxb7ePwEGTwDOmjrz6HiN7Ec8nXO2wp7nh+uQi10MahSFewQ0wziM 18vw== X-Gm-Message-State: AO0yUKUjR8/VCV0wqTly1HzylaOZSGeE+QQAWhrnCr0bhJBtJyjtmYtG SK7LVT6/L1ePAq+dmtOQGNCkgAKFV5wrYw== X-Google-Smtp-Source: AK7set+ingWLqWvHbOiTqEsu60GSQwYRPo51S7N/NTAhunTri7P5idecFE4VhKoTo9ZA9qQdEGDqNA== X-Received: by 2002:a17:90b:4d81:b0:22c:61c1:18dd with SMTP id oj1-20020a17090b4d8100b0022c61c118ddmr11934091pjb.10.1675129925671; Mon, 30 Jan 2023 17:52:05 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:05 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/8] perfetto: Fix build with gcc13 Date: Mon, 30 Jan 2023 17:51:56 -0800 Message-Id: <20230131015200.3862532-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131015200.3862532-1-raj.khem@gmail.com> References: <20230131015200.3862532-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100865 Signed-off-by: Khem Raj --- ...ng-header-cstdint-for-uintXX_t-types.patch | 58 +++++++++++++++++++ meta-oe/recipes-devtools/perfetto/perfetto.bb | 3 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch new file mode 100644 index 0000000000..d08721ae65 --- /dev/null +++ b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch @@ -0,0 +1,58 @@ +From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 29 Jan 2023 22:03:01 -0800 +Subject: [PATCH] Add missing header for uintXX_t types + +This is detected by gcc-13 +gcc 13 moved some includes around and as a result is no +longer transitively included [1]. Explicitly include it for uintXX_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://android-review.googlesource.com/c/platform/external/perfetto/+/2399128] +Signed-off-by: Khem Raj +--- + include/perfetto/ext/base/http/sha1.h | 1 + + include/perfetto/ext/base/uuid.h | 1 + + src/traced/probes/common/cpu_freq_info.h | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/include/perfetto/ext/base/http/sha1.h b/include/perfetto/ext/base/http/sha1.h +index c583d69d4..7e3a48c83 100644 +--- a/include/perfetto/ext/base/http/sha1.h ++++ b/include/perfetto/ext/base/http/sha1.h +@@ -20,6 +20,7 @@ + #include + + #include ++#include + #include + + namespace perfetto { +diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h +index 1b4c53815..472042fab 100644 +--- a/include/perfetto/ext/base/uuid.h ++++ b/include/perfetto/ext/base/uuid.h +@@ -18,6 +18,7 @@ + #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ + + #include ++#include + #include + + #include "perfetto/ext/base/optional.h" +diff --git a/src/traced/probes/common/cpu_freq_info.h b/src/traced/probes/common/cpu_freq_info.h +index 36f7f9c09..8232cbf64 100644 +--- a/src/traced/probes/common/cpu_freq_info.h ++++ b/src/traced/probes/common/cpu_freq_info.h +@@ -17,6 +17,7 @@ + #ifndef SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ + #define SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ + ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb index 1605de489f..3cc732b700 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb @@ -17,7 +17,8 @@ SRC_URI:append = " \ git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \ git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \ https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \ - file://0001-Remove-check_build_deps-build-steps.patch " + file://0001-Remove-check_build_deps-build-steps.patch \ + file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch" SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3" SRCREV_libcxx = "d9040c75cfea5928c804ab7c235fed06a63f743a" From patchwork Tue Jan 31 01:51:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18827 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC2C2C64EC4 for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.2807.1675129927427982313 for ; Mon, 30 Jan 2023 17:52:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=L3l2FwvB; spf=pass (domain: gmail.com, ip: 209.85.216.49, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f49.google.com with SMTP id rm7-20020a17090b3ec700b0022c05558d22so12938680pjb.5 for ; Mon, 30 Jan 2023 17:52:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XxuN+8dk6aSz4//XnQ5A4xa8kDIpuFWG8xYVzudNB30=; b=L3l2FwvBNmI/idlyvBHcfSVExUkvFUFBvcgsW0NvojBmIvkxmCJ1fLophenj44Zen+ i/nPVinu9BbY1BLhgFPfLSljIo/Wu0KBgk8uY7nHrAwN04SBeQx7bxnbz6GYwXUEkhba clv2qlgEitWAAn7Wzu4TvFLQR82qQoCmtG9IwVrzqw9eUGHZzIXVY20uJSUCvyDNz642 kEDkoBgGUxsjfczKx+2ShCisigYa7mYwdXQ1E93adQsypeZnvY4AgakrSvFoPACK4/F0 ChRX2TPAI0sbR1tOCmgMGSrcBgr649Q3fPW9Rz7DsgxP+x0x9TfYaMMii10ckAGGfMpS lUXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XxuN+8dk6aSz4//XnQ5A4xa8kDIpuFWG8xYVzudNB30=; b=Hc+SUSBs9T5zPvcuySfvnyEWm8RbVzKry9GEpVYT9VXaU7+kCdbA80pl430XtzWV9v zoljLoB6/hn1hKpQyEF6R4/cF1/uSBbNWBM8N2MPb8xR1gxnriHbbUcp0HrpAX6D7jFo BRr5Rf8ERuoIdx8E5Q08hx6tFY2Up9A+ODBKxeu1pPiH3eDaPvDF386vbkK4jV2pBl+s yVWf4OvyO2lf5N90EN7bTK0cnJVlYEizdwdxQU3y2A0knTQwFILiB5xc1SMEWHDOm7wJ TCeGAUiYF9/MYjYFkVHZYZrSPEebx8FRA8d8wUjU/RspXEcrtZ9PLUUrxkf2a92C0GDi sJTg== X-Gm-Message-State: AO0yUKVgT82o2+hqz4bl0iR/x7UNM836/1M4FH6BCzdbwYu82KTe/3T6 ycnz365d6W5PE9JXdW0GvLKhL10G87vWjQ== X-Google-Smtp-Source: AK7set8PffTIWBeoY5B0wJ0JRl97usrEhQPesCZk3J6rP/oRW6lP7SVpHGK/Dh59Mf9K0m2KFSreRw== X-Received: by 2002:a17:90a:1a05:b0:22c:7e4d:cb01 with SMTP id 5-20020a17090a1a0500b0022c7e4dcb01mr9134357pjk.41.1675129926570; Mon, 30 Jan 2023 17:52:06 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:06 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 5/8] ntopng: Add hiredis to depends Date: Mon, 30 Jan 2023 17:51:57 -0800 Message-Id: <20230131015200.3862532-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131015200.3862532-1-raj.khem@gmail.com> References: <20230131015200.3862532-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100866 Fails to link otherwise ld: cannot find -lhiredis: No such file or directory collect2: error: ld returned 1 exit status Signed-off-by: Khem Raj --- meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb index dca929b574..110ca36866 100644 --- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb @@ -6,7 +6,7 @@ usability, and features." SECTION = "console/network" -DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" +DEPENDS = "curl hiredis libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" RDEPENDS:${PN} = "bash redis" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" From patchwork Tue Jan 31 01:51:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18826 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A480CC636D7 for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.2808.1675129928236320996 for ; Mon, 30 Jan 2023 17:52:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=J1G6Dkfi; spf=pass (domain: gmail.com, ip: 209.85.214.173, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f173.google.com with SMTP id e6so5361139plg.12 for ; Mon, 30 Jan 2023 17:52:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IEcMu8ITyjxj8wWvTNn5DDcydKE3Eu7dgnKbd03IPHE=; b=J1G6DkfiEqEty4QI/w9YaZIhWCQVaLSeQ1TroT8XorKM89Zq1hFZDaEJK5wpNsDlkH rj303Lb2FhdrZmv0Mcuxod7HeHPlxEgDPPWJYPeCVWjDe7OKVL7/VD/NIgTxDetSn0MD IEQu2Yp73D0mwDvJBpgBkszhahlfSsDCSKjtGEKMWzhjL/40gaum+z71pDGd0UmbBfo6 xx7eQ1fUtghvYsveRXLmfxaKOvyJMPtmkDXHNKChVH0MYKeobQhr+HurrMQSmLlBPyAN nfNhNsDOVdzwWLu86CBi2ayC2dzdRUZVpq0ZPeo1LA1D4SohY1vGxfCAlTzn7+QUhyfX T+hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IEcMu8ITyjxj8wWvTNn5DDcydKE3Eu7dgnKbd03IPHE=; b=F8IjKGDxhDRZ1ZB/g8WBjjHG5jF2rhZcOj5k/k2Nr1uEsUkP/cG/aadlJwVDIUIP7j GlD1RqdOd1wi2LF55sBzNuG4/GQgCXS5JIn0XeymVd4cziDi10Kfg1Jxb8vtkOSNSQqG msk19guzUG8kxN9MOQZo53Sp4BkpY/QFVegtZhJiIsPcmfWtiNwOrK9EC+vVwno65h9d uhfm3FkmUyEyDb7dNDGPBRjHxOUlQhh3sXwb3+nw/5O/QusaBGOlMjbArFDOQfNKaBVQ D2+WeUCQCcc1Q/bRQiGpYAQ4HB9GDXdNAbctc9ys/8g3HTiMIh7GsVv0OIkehyYCaLYq i+vw== X-Gm-Message-State: AO0yUKVshMDmW4I7SS8bzfMFwaRVXuOpLnipkAIgY0Fjdg8WLp9mqAqt oe4WkMrP6yIcPM9F3dDSIZfNjW2elnkreQ== X-Google-Smtp-Source: AK7set+RP9kMWHADRR1HMtdVyx60/nSf7Uv1mHfie6Hx4V3HXruBXm/1QQN98CmF+nIvLYMj+LhvzQ== X-Received: by 2002:a17:90a:1a15:b0:22c:912:b80d with SMTP id 21-20020a17090a1a1500b0022c0912b80dmr23679310pjk.33.1675129927413; Mon, 30 Jan 2023 17:52:07 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:07 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 6/8] python3-grpcio: Fix build with gcc13 Date: Mon, 30 Jan 2023 17:51:58 -0800 Message-Id: <20230131015200.3862532-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131015200.3862532-1-raj.khem@gmail.com> References: <20230131015200.3862532-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100867 Signed-off-by: Khem Raj --- .../0001-Include-missing-cstdint-header.patch | 32 +++++++++++++++++++ .../python/python3-grpcio_1.51.1.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch new file mode 100644 index 0000000000..f970cf3c3c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch @@ -0,0 +1,32 @@ +From 752e30eebe5b91c323bafcbea8d450dd5683701a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 30 Jan 2023 10:31:10 -0800 +Subject: [PATCH] Include missing header + +gcc 13 moved some includes around and as a result is +no longer transitively included [1]. Explicitly include it for +int32_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970] +Signed-off-by: Khem Raj +--- + third_party/re2/util/pcre.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h +index 896b0bd..271a005 100644 +--- a/third_party/re2/util/pcre.h ++++ b/third_party/re2/util/pcre.h +@@ -163,6 +163,7 @@ + + #include "util/util.h" + #include "re2/stringpiece.h" ++#include + + #ifdef USEPCRE + #include +-- +2.39.1 + diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb index b0971db1cc..3d45c56b0a 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb @@ -10,6 +10,7 @@ SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ file://boring_ssl.patch \ file://mips_bigendian.patch \ + file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ " SRC_URI[sha256sum] = "e6dfc2b6567b1c261739b43d9c59d201c1b89e017afd9e684d85aa7a186c9f7a" From patchwork Tue Jan 31 01:51:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94EA0C636D6 for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.2809.1675129929141340800 for ; Mon, 30 Jan 2023 17:52:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aacn6goA; spf=pass (domain: gmail.com, ip: 209.85.216.48, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f48.google.com with SMTP id l4-20020a17090a850400b0023013402671so806349pjn.5 for ; Mon, 30 Jan 2023 17:52:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SRRb4/DN1yq6wYk8+jFxDsuzSIbUCfME9lNu/W9aQfA=; b=aacn6goAwEs1S1BEBNSUNlTP1JXZbMZPEpyyaB9JRZyJYx9ldM3zPAfQRjTp17PXBo unraVoNzWkAZPkMDVq9TgfREgsWiXqvOhfthyOJVA/YstgcCyN4b+6kM5QSiWvSHe1CZ MMiX+C9kKeMW2kIGa4yNUgdTSFeF2iPhzplKsQQ1/XT/6iC4xqW6I/hBuzubOwNcQXcf k/+B8AHYCkGet2S2vGbaxuNKHbcGh4lm6XGC8APqucxYSFTKF1QwDK048lc14uq7JbR6 EmVgn5EWLyxVwfx765LamNLrm6MDR4ONi4hvryWhffo2BtIRc9bt1G0JqADM9d4AicFd fPyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SRRb4/DN1yq6wYk8+jFxDsuzSIbUCfME9lNu/W9aQfA=; b=mHC/TH68p4A/SyS4ec0mlbegK1C15Ntd7wNQcig6VTE9sz7YJ7sh8tkzoKDuaGl87f ugYHnf7NjyagH+g5JdpcV1C9jQgNmPQcetH/PnJzrnedtlE6d0BwiSH07mk6gQqpHx+G 770kT6bBxn3m+KmRY1oULgnN3fJvboab8zsCjsf9WyDbpkA/RoM6cj5/uNxuFYB+E6wF NM8NLxLKyP+Gp3Fln2NvPFO3kifhP1n5lpVClfLMFcJ325mmbZru9tZbR6iKdbpUHK9A aYeGxbmSsezW8WKDMFg8f6W7gxyRsHSUNSsX2VH0vrRpOOpoZUgz3vTAHhqQX7V4fYBM 1gaA== X-Gm-Message-State: AO0yUKVcCXoRL9AMWEe0/UTJuPHlxqmS4iEh0rTnuGIX+8Pr4R8c6JLp 3KfOyp1fsgFpjjXHLfkIV3fAyk00m16Z9A== X-Google-Smtp-Source: AK7set/fFZLSZuX0J+47SuxOrwsoZqPDOsEMRAjankynPfg0ni2rwjXWhv5sRsWsqE0YhKH4XUv6kA== X-Received: by 2002:a05:6a21:6da2:b0:bc:b8d:9ee3 with SMTP id wl34-20020a056a216da200b000bc0b8d9ee3mr23102086pzb.46.1675129928312; Mon, 30 Jan 2023 17:52:08 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:07 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 7/8] tesseract: Fix build with gcc13 Date: Mon, 30 Jan 2023 17:51:59 -0800 Message-Id: <20230131015200.3862532-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131015200.3862532-1-raj.khem@gmail.com> References: <20230131015200.3862532-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100868 Signed-off-by: Khem Raj --- ...ild-with-gcc-13-by-including-cstdint.patch | 32 +++++++++++++++++++ .../tesseract/tesseract_5.3.0.bb | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch diff --git a/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch b/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch new file mode 100644 index 0000000000..2978080c92 --- /dev/null +++ b/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch @@ -0,0 +1,32 @@ +From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 30 Jan 2023 11:27:07 -0800 +Subject: [PATCH] Fix build with gcc 13 by including + +gcc 13 moved some includes around and as a result is +no longer transitively included [1]. Explicitly include it for +int32_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/tesseract-ocr/tesseract/pull/4009] +Signed-off-by: Khem Raj +--- + src/ccutil/params.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ccutil/params.h b/src/ccutil/params.h +index f514d870..0f3f8743 100644 +--- a/src/ccutil/params.h ++++ b/src/ccutil/params.h +@@ -21,6 +21,7 @@ + + #include // for TESS_API + ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb b/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb index f791ad546b..057a7cd859 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "080da83cc51c4ef8b324a7e03146fe0bd7e0944b" SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https \ - " + file://0001-Fix-build-with-gcc-13-by-including-cstdint.patch" S = "${WORKDIR}/git" From patchwork Tue Jan 31 01:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18832 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB0ECC64EC5 for ; Tue, 31 Jan 2023 01:52:10 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.2769.1675129930078881545 for ; Mon, 30 Jan 2023 17:52:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mhEj4irJ; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id pj3so6956pjb.1 for ; Mon, 30 Jan 2023 17:52:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=39yj+Djuh/t1toFK32myOTYcK2fRsoRvCshTT35zcrc=; b=mhEj4irJMyuqarGl6jEK0eXD6qqs7b6iRiEa3qbt9fo7ajXCQ4Qjua7sUpAQS02IrE blURcI2KAvXiRk4V0no6l7J3FBmMLmmgch+usqytFA0RByQU44/shQH3tEXTyI/7J/Gr 6gccxgtT3l4F6c+Tqkg5M/Dn/t7ryi+7ALxJwV1QeO9nWb3SOwXIw5zyoIsSSl+EG6Rl ppQ6LCBASeE7DUPVSeaFNY7dh/f31BfwrygLgDX07oUKnkrdHwdB5a4SGxI9RiSW57B/ OTcNQ1U7uSebtdnthh7YCW1I3MM31NOik1laVFbLZEcOsGi8hQ4cn6ZhE5fCeM1o78Dm S2eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=39yj+Djuh/t1toFK32myOTYcK2fRsoRvCshTT35zcrc=; b=pdcYLASFHD/wmaMUbLTxdQi2Yar2k7yUCJcnHdeoQaUAIPIt5X0axOqp/w9zELmvfz ++uVqSEHn/D2IRdY4YZTunIzLosBAOP3VaKAaATwNgIjSChxXHQ+vHb/yDpKELh4or6t Dfw066muNo7vB4f1YhehO3salfWr5XNUJF+e0F7FbDqkT920L2wsZjyebfc6Kzhm321b evvELtQi0b45FNOyC2uFE0styl6dPG2Rcxqi98KQygbYYiNp7eI7x5yQqtDRRCTHA+hT 47HK+T0b/81mS6sMvipHDbB5YfhgbIE7SWf4WrJEbXG8ksNFZRXvEO+QW6/WadulyfTq VzMA== X-Gm-Message-State: AFqh2kriyVGqDQWbUgw0qKEdjM4td0HJIpl5L72UzPkWPHfclAfHRhS5 ZYc6HBsAR3ivJMinTa5bjY5ljjRtcFrTIg== X-Google-Smtp-Source: AMrXdXvnqIUX/rKdl7J1bVc8ffp580NDWWiXyzP+0sD13seX1C5nkuMNlZ7et0N35C8zNSRh8g2EEA== X-Received: by 2002:a17:90a:4bc2:b0:229:7b29:54ac with SMTP id u2-20020a17090a4bc200b002297b2954acmr52946326pjl.35.1675129929176; Mon, 30 Jan 2023 17:52:09 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id mj8-20020a17090b368800b0021900ba8eeesm10096859pjb.2.2023.01.30.17.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 17:52:08 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 8/8] lcdproc: Update to latest tip of trunk Date: Mon, 30 Jan 2023 17:52:00 -0800 Message-Id: <20230131015200.3862532-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230131015200.3862532-1-raj.khem@gmail.com> References: <20230131015200.3862532-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Jan 2023 01:52:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100869 Drop patches already present in trunk as of now Signed-off-by: Khem Raj --- .../0001-Fix-compilation-with-GCC-10.x.patch | 39 --------------- ...ld-fix-port-internal-make-dependenci.patch | 33 ------------- ...ude-limits.h-for-PATH_MAX-definition.patch | 41 ---------------- .../0003-Fix-non-x86-platforms-on-musl.patch | 49 ------------------- .../recipes-extended/lcdproc/lcdproc_git.bb | 9 +--- 5 files changed, 2 insertions(+), 169 deletions(-) delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch deleted file mode 100644 index cd8a69c3fb..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9b07f6a472c24f5e1b65746756764391be0d55e4 Mon Sep 17 00:00:00 2001 -From: Harald Geyer -Date: Mon, 10 Feb 2020 13:15:10 +0100 -Subject: [PATCH] Fix compilation with GCC >= 10.x - -Starting with GCC >= 10.x, -fno-common is used as default -instead of -fcommon. This patch fixes the compilation. - -Closes: #148 - -Upstream-Status: Backport -Suggested-by: Conrad Kostecki -Signed-off-by: Harald Geyer ---- - clients/lcdproc/iface.c | 1 + - clients/lcdproc/iface.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - ---- a/clients/lcdproc/iface.c -+++ b/clients/lcdproc/iface.c -@@ -32,6 +32,7 @@ - #define UNSET_INT -1 - #define UNSET_STR "\01" - -+IfaceInfo iface[MAX_INTERFACES]; - - static int iface_count = 0; /* number of interfaces */ - static char unit_label[10] = "B"; /* default unit label is Bytes */ ---- a/clients/lcdproc/iface.h -+++ b/clients/lcdproc/iface.h -@@ -18,7 +18,7 @@ - /** max number of interfaces in multi-interface mode */ - #define MAX_INTERFACES 3 - --IfaceInfo iface[MAX_INTERFACES]; /* interface info */ -+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ - - /** Update screen content */ - int iface_screen(int rep, int display, int *flags_ptr); diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch deleted file mode 100644 index f6a7956db2..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a20feee4963bc38975fbaf44bbe85a31825f59db Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Apr 2019 17:28:28 -0700 -Subject: [PATCH 1/3] Fix parallel build (fix port-internal make dependencies) - on many cores - -Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142] -Signed-off-by: Khem Raj ---- - server/drivers/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am -index e08f2b2d..4fd2e3f1 100644 ---- a/server/drivers/Makefile.am -+++ b/server/drivers/Makefile.am -@@ -47,11 +47,11 @@ CwLnx_LDADD = libLCD.a libbignum.a - futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a - g15_LDADD = @LIBG15@ - glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@ --glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o -+glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a - glcdlib_LDADD = @LIBGLCD@ - glk_LDADD = libbignum.a - hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a --hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ -+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a - i2500vfd_LDADD = @LIBFTDI_LIBS@ - imon_LDADD = libLCD.a libbignum.a - imonlcd_LDADD = libLCD.a --- -2.24.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch deleted file mode 100644 index eb866bf10a..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d447a05ee560ba5894d2ed4cd93d0475c2f3c08e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 17 Dec 2019 17:39:32 -0800 -Subject: [PATCH 2/3] Include for PATH_MAX definition - -musl libc exposes the missing include - -Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142] -Signed-off-by: Khem Raj ---- - server/drivers/hidraw_lib.c | 1 + - server/drivers/linux_input.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/server/drivers/hidraw_lib.c b/server/drivers/hidraw_lib.c -index 49b03f20..3b51f279 100644 ---- a/server/drivers/hidraw_lib.c -+++ b/server/drivers/hidraw_lib.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/server/drivers/linux_input.c b/server/drivers/linux_input.c -index 5b914d4c..6fcfc591 100644 ---- a/server/drivers/linux_input.c -+++ b/server/drivers/linux_input.c -@@ -5,6 +5,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.24.1 - diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch deleted file mode 100644 index eed9ceee5e..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7fd144f101fa5c9316d3468ed26f55629afe1305 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 17 Dec 2019 17:55:54 -0800 -Subject: [PATCH 3/3] Fix non x86 platforms on musl - -Musl only specifies in/outb for x86/x86. Use the fallback path in case -musl is used. - -This should fail compilation during the linking stage but for some reason -does not. Will do if -Werror=implicit-function-declaration is specified. - -Original here: https://github.com/openwrt/packages/blob/master/utils/lcdproc/patches/110-in-outb.patch -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - server/drivers/port.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/server/drivers/port.h -+++ b/server/drivers/port.h -@@ -94,7 +94,7 @@ static inline int port_deny_multiple(uns - /* ---------------------------- Linux ------------------------------------ */ - /* Use ioperm, inb and outb in (Linux) */ - /* And iopl for higher addresses of PCI LPT cards */ --#if defined HAVE_IOPERM -+#if HAVE_INB - - /* Glibc2 and Glibc1 */ - # ifdef HAVE_SYS_IO_H -@@ -333,7 +333,7 @@ static inline int port_deny_multiple (un - return i386_set_ioperm(port, count, 0); - } - --#else -+#elif defined(__x86__) && defined(__x86_64__) - - /* ------------------------- Everything else ----------------------------- */ - /* Last chance! Use /dev/io and i386 ASM code (BSD4.3 ?) */ ---- a/configure.ac -+++ b/configure.ac -@@ -144,6 +144,7 @@ AC_CHECK_LIB(i386, i386_get_ioperm, - [])] - ) - -+AC_CHECK_FUNCS(inb) - AC_CHECK_FUNCS(iopl) - AC_CHECK_FUNCS(ioperm) - AC_CHECK_HEADERS(sys/io.h) diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 76a931666d..4cae4947f2 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -10,13 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ file://README.md;beginline=107;md5=5db392f043253a2d64b1737068ce6b58" PV = "0.5.9+git${SRCPV}" -SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134" -SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https \ - file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ - file://0002-Include-limits.h-for-PATH_MAX-definition.patch \ - file://0003-Fix-non-x86-platforms-on-musl.patch \ - file://0001-Fix-compilation-with-GCC-10.x.patch \ - " +SRCREV = "0e2ce9b9c46c47363436f9ee730f7c71bf455f0f" +SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https" S = "${WORKDIR}/git"