From patchwork Wed Jul 5 17:25:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 26917 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 F4221C001DF for ; Wed, 5 Jul 2023 17:25:54 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web10.1022.1688577953786669972 for ; Wed, 05 Jul 2023 10:25:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=ME1ziHd5; spf=pass (domain: gmail.com, ip: 209.85.215.176, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-5577004e21bso2561676a12.2 for ; Wed, 05 Jul 2023 10:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688577953; x=1691169953; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GKY1WY1W+DrrHzuhvPv7xThOfzMd8T2SYq9I8aB1BU8=; b=ME1ziHd5mOKaJ8+GUWSHCDdrasU5ja2vrsUEuT9NlJw2fBaH0F2NyweEJv0t6lirK6 CD5asAYOHzacnXuKANEppoOQkcWE+gExQYFw3U2IkWBToZWQCYX8w6jAOfJDiu95T5Pw ha4wvCAKeMXLncfJMF5JNe07603kfy/bB7+UMj6RkwwN9MtiR4RBrKOWmxYR0sE/NC5N NCuZXqJ7girmjPJad7gYNy1L8c3mpmcKh2P6Z5E8vGwUYgmF5TWeGKOVqt8Z1YehUtPc J4satY5e7Vf1bHW+/MWBQOC6DuVTr10HewmI5chZspYd1BMF0QLd+9dM+PyF3jjbRq1F hHJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688577953; x=1691169953; 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=GKY1WY1W+DrrHzuhvPv7xThOfzMd8T2SYq9I8aB1BU8=; b=em+okImAu0LND/oQX/qDw4LYDcYc6Ot8FiHyvlWjMbs2M14Nyybiaug/klmcUEIhdM Za1riUKO4EqYUvOL2hO8suvlu2NdrR8jjKyVxjNVvGehqnREakZydbmj5ApAh+Dc87ZJ EIpNWPjeq6jPPJgrDLY9kLCVhXb7l8am4j4IfJZcSNJJ1AGdEXlpykve6WYE+ayUcf5Z QlB+5K2K2k1Qy5HJm7KcoQL3SN0YHgDSVh5EI1Ld19QxB0Wqs58DUxBsDOu2Xeq48H2Y 4QwxpYxPx/3kcJth8tsU3DNXjGD1VGkEPpNPfIJeEEbd0qh/SQTmAgB4tRlHyhzHK875 cEWw== X-Gm-Message-State: AC+VfDwWuY/KnGnkJDPErS9HKfhgvhatOKv51pYF6KhgGdqhUDxhVbvY jOcqDH8rPsuAEAYnY5dCmnzvQzyTWfk= X-Google-Smtp-Source: ACHHUZ6E7ojWxTG7gDbYk74gS0HsyqEweq2GUkyGoWr/A0NK+fUfzBg6s6eQr0AM6Tehi91pJA+GDQ== X-Received: by 2002:a05:6a20:1446:b0:125:f3d8:e65b with SMTP id a6-20020a056a20144600b00125f3d8e65bmr16665102pzi.18.1688577952820; Wed, 05 Jul 2023 10:25:52 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::81d4]) by smtp.gmail.com with ESMTPSA id w6-20020aa78586000000b0067b384d5955sm13869174pfn.26.2023.07.05.10.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 10:25:52 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 1/4] python3-grpcio-tools: Upgrade to 1.56.0 Date: Wed, 5 Jul 2023 10:25:47 -0700 Message-ID: <20230705172550.3371930-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.41.0 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 ; Wed, 05 Jul 2023 17:25:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103668 Signed-off-by: Khem Raj --- ...f-Disable-musttail-attribute-on-mips.patch | 8 ++++---- .../python/python3-grpcio-tools_1.56.0.bb | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.56.0.bb diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch index 8b13d7ae21..8c70b2b6a6 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch @@ -14,11 +14,11 @@ Signed-off-by: Wang Mingyu --- a/third_party/protobuf/src/google/protobuf/port_def.inc +++ b/third_party/protobuf/src/google/protobuf/port_def.inc -@@ -255,6 +255,7 @@ +@@ -338,6 +338,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125 #error PROTOBUF_TAILCALL was previously defined #endif - #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ + #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ + !defined(__mips__) && \ - !defined(_ARCH_PPC) && !defined(__wasm__) && \ - !(defined(_MSC_VER) && defined(_M_IX86)) && \ + !defined(_ARCH_PPC) && !defined(__wasm__) && \ + !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__) && \ !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.56.0.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.56.0.bb new file mode 100644 index 0000000000..eb1994d7ce --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.56.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Google gRPC tools" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-grpcio" + +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ + file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \ + " +SRC_URI[sha256sum] = "39f5877cea514b3da9f2683dfb3ffb45ef47b05f4ff39c287d7d61c5057f48b8" + +RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" + +BBCLASSEXTEND = "native nativesdk" From patchwork Wed Jul 5 17:25:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 26919 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 D3F79EB64DD for ; Wed, 5 Jul 2023 17:26:04 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web11.1040.1688577955104663034 for ; Wed, 05 Jul 2023 10:25:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=AedySfX8; spf=pass (domain: gmail.com, ip: 209.85.215.175, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-55b66ca1c80so2568328a12.0 for ; Wed, 05 Jul 2023 10:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688577954; x=1691169954; 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=fDrp5hxKeEMso1/L5ribax1tC2oe6PBhT9wrqanr5+4=; b=AedySfX81WIC1R6FDdvYVobwV9YLpGBy9n+EmVMsAME7wSbLprnmXRg0dlQo841YU/ VD7pwNnoGHbeAUzc4f7hqAYURGPb72vJ5WVkqbOlGQjhw3wBlZYk6tjVmC1EHkPYFJY0 L12K7wgKZeMwmk0mHQ831XvxtCEPKtO41PoXI9jqLRIFhjM5wgXVtEArVFJJ1zbIro1b nlQAJUsNpfrEGd+30Mo4r4nUGnrZBHsQUXfmR1UPeSHL/VFeG5C3cVnSaQZH7BrfzHzV EMI4DnoCALMjOuHPFCI/N9xwjL+WRcYEDhqIICEeNaKyNhp2H/HKl/x9bL2l/Wu2Wico pt1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688577954; x=1691169954; 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=fDrp5hxKeEMso1/L5ribax1tC2oe6PBhT9wrqanr5+4=; b=SI/LM1Gqsm9lk+Oru+LbOQiSqdnfHNNZ0TbuPAoqvmcjItrH3bKS4b6Ag1DY7JoXGX AkgvHFOACM3e2tjWaDzx7dQq4IgCeNcSFoQg9Ldj9UHx3ocW6ENfgmFht+lxWyCOabgD OCllU4/gx57yxepRXBQMiARTklwDMWHvk2lnDkNE4PL5+D/MtJllp2Tu/6BhGkramIFN l4V0YZU3UqYBtJ6c6XKvBzbIA3Igxr8hAmdgZEwZdtFqZhgWVfYbjx1/79vz0SLGQP8Z nbyAX5XdpGt3NZ6DqFlAt3MUw8iDmG01/jEuV25SO8lAOz5RMbSpIxscHJ7a65BTYUBd 2CDQ== X-Gm-Message-State: ABy/qLaWj48rtwGTr293jAjq/pEC/PfDba0isL4ZNZLTYVENbGtMs+H2 PCtQsdjEFV7fzffWlPl+hPL5/d3CDTY= X-Google-Smtp-Source: APBJJlGfIcW0p9bYHtsv6WFrFLX2j8byp1GPfKvEWH1EuUsMZkIprZW5foMW22rdKfppg0BSkisrfA== X-Received: by 2002:a05:6a20:7f92:b0:12f:8bf8:69e1 with SMTP id d18-20020a056a207f9200b0012f8bf869e1mr2695083pzj.41.1688577954083; Wed, 05 Jul 2023 10:25:54 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::81d4]) by smtp.gmail.com with ESMTPSA id w6-20020aa78586000000b0067b384d5955sm13869174pfn.26.2023.07.05.10.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 10:25:53 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-python][PATCH 2/4] python3-grpcio: Upgrade to 1.56.0 Date: Wed, 5 Jul 2023 10:25:48 -0700 Message-ID: <20230705172550.3371930-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705172550.3371930-1-raj.khem@gmail.com> References: <20230705172550.3371930-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 ; Wed, 05 Jul 2023 17:26:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103669 Signed-off-by: Khem Raj --- .../python/python3-grpcio-tools_1.51.1.bb | 19 ------- ...-Do-not-mix-C-and-C-compiler-options.patch | 16 ++---- .../python3-grpcio/abseil-ppc-fixes.patch | 37 +++++--------- .../python/python3-grpcio/boring_ssl.patch | 50 ------------------- .../ppc-boringssl-support.patch | 8 +-- ...cio_1.51.1.bb => python3-grpcio_1.56.0.bb} | 8 +-- 6 files changed, 27 insertions(+), 111 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.51.1.bb delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch rename meta-python/recipes-devtools/python/{python3-grpcio_1.51.1.bb => python3-grpcio_1.56.0.bb} (86%) diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.51.1.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.51.1.bb deleted file mode 100644 index c1dbde1c9a..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.51.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Google gRPC tools" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-grpcio" - -SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ - file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \ - " -SRC_URI[sha256sum] = "8e62d23d3fed9d4f81738f98dd193dbd2e21aed4a8f0dd715e75b5439e649727" - -RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 1f465dbb6e..13911ddcf3 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -29,11 +29,9 @@ Signed-off-by: Wang Mingyu src/python/grpcio/commands.py | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) -diff --git a/setup.py b/setup.py -index 3a50c97..bb2386d 100644 --- a/setup.py +++ b/setup.py -@@ -205,8 +205,11 @@ def check_linker_need_libatomic(): +@@ -206,8 +206,11 @@ def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') @@ -47,7 +45,7 @@ index 3a50c97..bb2386d 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE) -@@ -215,8 +218,8 @@ def check_linker_need_libatomic(): +@@ -216,8 +219,8 @@ def check_linker_need_libatomic(): return False # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 @@ -58,15 +56,14 @@ index 3a50c97..bb2386d 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE) -diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py -index d93b6c7..a8c4a51 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py -@@ -228,7 +228,10 @@ class BuildExt(build_ext.build_ext): +@@ -228,8 +228,10 @@ class BuildExt(build_ext.build_ext): """ try: # TODO(lidiz) Remove the generated a.out for success tests. -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'], +- cc = os.environ.get('CC', 'cc') +- cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++14', '-'], + cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + if not cc_args: + cc_args = "-g" @@ -74,6 +71,3 @@ index d93b6c7..a8c4a51 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) --- -2.25.1 - diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch index 3de3d0f083..4100cf63f7 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch @@ -18,8 +18,6 @@ Upstream-Status: Pending absl/debugging/internal/stacktrace_config.h | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) -diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc -index b1c396c..d62bfd6 100644 --- a/absl/base/internal/unscaledcycleclock.cc +++ b/absl/base/internal/unscaledcycleclock.cc @@ -20,7 +20,7 @@ @@ -40,22 +38,6 @@ index b1c396c..d62bfd6 100644 int64_t UnscaledCycleClock::Now() { #ifdef __GLIBC__ -diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h -index 2cbeae3..683a5ef 100644 ---- a/absl/base/internal/unscaledcycleclock.h -+++ b/absl/base/internal/unscaledcycleclock.h -@@ -46,7 +46,8 @@ - - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ -+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ -+ defined(__riscv) || \ - defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else -diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc -index 5bdd341..a784e0d 100644 --- a/absl/debugging/internal/examine_stack.cc +++ b/absl/debugging/internal/examine_stack.cc @@ -33,6 +33,10 @@ @@ -69,7 +51,7 @@ index 5bdd341..a784e0d 100644 #include "absl/base/attributes.h" #include "absl/base/internal/raw_logging.h" #include "absl/base/macros.h" -@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) { +@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) return reinterpret_cast(context->uc_mcontext.pc); #elif defined(__powerpc64__) return reinterpret_cast(context->uc_mcontext.gp_regs[32]); @@ -81,8 +63,6 @@ index 5bdd341..a784e0d 100644 #elif defined(__riscv) return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); #elif defined(__s390__) && !defined(__s390x__) -diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h -index 3929b1b..23d5e50 100644 --- a/absl/debugging/internal/stacktrace_config.h +++ b/absl/debugging/internal/stacktrace_config.h @@ -60,7 +60,7 @@ @@ -94,6 +74,15 @@ index 3929b1b..23d5e50 100644 #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_powerpc-inl.inc" #elif defined(__aarch64__) --- -2.25.1 - +--- a/absl/base/internal/unscaledcycleclock_config.h ++++ b/absl/base/internal/unscaledcycleclock_config.h +@@ -21,7 +21,8 @@ + + // The following platforms have an implementation of a hardware counter. + #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ +- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ ++ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ ++ defined(__riscv) || \ + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) + #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 + #else diff --git a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch deleted file mode 100644 index d12e35a993..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f71b32eb8a5c173fc5733847437b9485d75bb2e5 Mon Sep 17 00:00:00 2001 -From: Leon Anavi -Date: Fri, 9 Apr 2021 14:06:36 +0300 -Subject: [PATCH] setup.py: Fix determining target platform - -Do not poke at the build machine to determine target platform or architecture -pass it from environment instead for cross compiling to work - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj -Signed-off-by: Leon Anavi ---- - setup.py | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index c93d419f32..71a944a9d0 100644 ---- a/setup.py -+++ b/setup.py -@@ -116,6 +116,9 @@ def _env_bool_value(env_name, default): - BUILD_WITH_BORING_SSL_ASM = _env_bool_value('GRPC_BUILD_WITH_BORING_SSL_ASM', - 'True') - -+BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM', -+ 'True') -+ - # Export this environment variable to override the platform variant that will - # be chosen for boringssl assembly optimizations. This option is useful when - # crosscompiling and the host platform as obtained by distutils.utils.get_platform() -@@ -336,13 +339,13 @@ if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL: - LINUX_X86_64 = 'linux-x86_64' - LINUX_ARM = 'linux-arm' - LINUX_AARCH64 = 'linux-aarch64' -- if LINUX_X86_64 == boringssl_asm_platform: -+ if LINUX_X86_64 == BORING_SSL_PLATFORM: - asm_key = 'crypto_linux_x86_64' -- elif LINUX_ARM == boringssl_asm_platform: -+ elif LINUX_ARM == BORING_SSL_PLATFORM: - asm_key = 'crypto_linux_arm' -- elif LINUX_AARCH64 == boringssl_asm_platform: -+ elif LINUX_AARCH64 == BORING_SSL_PLATFORM: - asm_key = 'crypto_linux_aarch64' -- elif "mac" in boringssl_asm_platform and "x86_64" in boringssl_asm_platform: -+ elif "mac" in boringssl_asm_platform and "x86_64" in BORING_SSL_PLATFORM: - asm_key = 'crypto_mac_x86_64' - else: - print("ASM Builds for BoringSSL currently not supported on:", --- -2.17.1 - diff --git a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch index 5c9be443d8..5dacc689fc 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch @@ -5,10 +5,10 @@ Signed-off-by: Khem Raj --- a/third_party/boringssl-with-bazel/src/include/openssl/base.h +++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h -@@ -99,6 +99,9 @@ extern "C" { - #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN) - #define OPENSSL_64_BIT - #define OPENSSL_PPC64LE +@@ -96,6 +96,9 @@ extern "C" { + #elif defined(__ARMEL__) || defined(_M_ARM) + #define OPENSSL_32_BIT + #define OPENSSL_ARM +#elif (defined(__PPC__) || defined(__powerpc__)) +#define OPENSSL_32_BIT +#define OPENSSL_PPC diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.56.0.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb rename to meta-python/recipes-devtools/python/python3-grpcio_1.56.0.bb index 7a9b7d8018..33c13b0a01 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.56.0.bb @@ -8,13 +8,12 @@ DEPENDS += "${PYTHON_PN}-protobuf" 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 \ file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ " -SRC_URI[sha256sum] = "e6dfc2b6567b1c261739b43d9c59d201c1b89e017afd9e684d85aa7a186c9f7a" +SRC_URI[sha256sum] = "4c08ee21b3d10315b8dc26f6c13917b20ed574cdbed2d2d80c53d5508fdcc0f2" RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ @@ -30,11 +29,14 @@ export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" BORING_SSL_PLATFORM:arm = "linux-arm" BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" +BORING_SSL_PLATFORM:aarch64 = "linux-aarch64" BORING_SSL_PLATFORM ?= "unsupported" export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" +export GRPC_BUILD_OVERRIDE_BORING_SSL_ASM_PLATFORM = "${BORING_SSL_PLATFORM}" -BORING_SSL:x86-64 = "1" BORING_SSL:arm = "1" +BORING_SSL:x86-64 = "1" +BORING_SSL:aarch64 = "1" BORING_SSL ?= "0" export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" From patchwork Wed Jul 5 17:25:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 26920 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 D3F53EB64DA for ; Wed, 5 Jul 2023 17:26:04 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web10.1024.1688577956331634649 for ; Wed, 05 Jul 2023 10:25:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=qnCxm2Gv; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-666e64e97e2so3506698b3a.1 for ; Wed, 05 Jul 2023 10:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688577955; x=1691169955; 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=txbZWotzreSCRT9knn0N7wnWv2D5uw2jYW0Y8zYl0Zo=; b=qnCxm2Gv8fvxpZCfIkCMUzdPEP0HV/qKQKZOzclMJbwKYGSTZtyZ5qrkY2Sa1my3PT 592q1HxBIMmvRooGuoQLyoPXyKbQitnpr6Skiz6RsIKnRc1YBb/fsOf4c4VKQv5MxquF UXbckID8jdXQ2uoA+AN1Lk/1Y4W8uQnsShapTwvCqINHElpKRgDAJ58+k/qjLknkinkA zRFGj2pNfR18hy7RG+VOf/Vot+9wT1lE9GNn6t5iMH5HhhDWTA8XDLxYqBgG9uttfjdv sqPp4CjpMLt9lE0MTKglu1F2VAp2Yrt78P/noAuZkPERzjZizYzyEqP4zNuP54icVJLN Uiug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688577955; x=1691169955; 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=txbZWotzreSCRT9knn0N7wnWv2D5uw2jYW0Y8zYl0Zo=; b=TjNnexM8ky6ri65O1yiAy6N0sq7pU5iXmTL0kApUBueCqAHjT2ZSvCSlH/k9QY/gjY w/wjlFF6zZN4C9UVAjpHUKPqSUTuJioOQ/QqYCil0G9jM2QaGluT8gXSahalySGx10Yc iBmwFlOlTqXIdGymUmRv8d/j4Lb1e9n/LMFcxpxI9x1+ulYa2yrHRKxob5CEgYLXCmHZ BlEGBiG8ZBj4lLVcmfw9YkkIowDm9jiXIfsSE7n2tDEEuFn1ATeUC40Sqe06AdbF8ssS ry7vf6RU5/NYulOMrSr/hX95eJkklYL256v1gd3C9g3PlN5tRXn14p5Z0NOoi4XmHZQ7 euOw== X-Gm-Message-State: ABy/qLZDS8+5+rC76oxB1i0sIGekJfYGbS5p5hkh7vGt+Ycub2JNx8x/ y7h5PuKFk0qicNAPDKKzBQefu4p3shY= X-Google-Smtp-Source: APBJJlEO/9fQsoly8Xp3Yn1EFY+ydVwXHsjgTHy49aWTyRPpiwZyfVAOuUykfHvCz8Au8YCxqhJe8g== X-Received: by 2002:a05:6a00:c8a:b0:65b:351a:e70a with SMTP id a10-20020a056a000c8a00b0065b351ae70amr17207957pfv.29.1688577955323; Wed, 05 Jul 2023 10:25:55 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::81d4]) by smtp.gmail.com with ESMTPSA id w6-20020aa78586000000b0067b384d5955sm13869174pfn.26.2023.07.05.10.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 10:25:54 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/4] geos: Use cmake directly Date: Wed, 5 Jul 2023 10:25:49 -0700 Message-ID: <20230705172550.3371930-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705172550.3371930-1-raj.khem@gmail.com> References: <20230705172550.3371930-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 ; Wed, 05 Jul 2023 17:26:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103670 configure is a wrapper script around cmake invocations which are already taken care of by cmake bbclass. e.g. specifying CMAKE_INSTALL_PREFIX or CMAKE_BUILD_TYPE Signed-off-by: Khem Raj --- meta-oe/recipes-navigation/geos/geos_3.12.0.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-oe/recipes-navigation/geos/geos_3.12.0.bb b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb index b77f3af2a8..95cb29775a 100644 --- a/meta-oe/recipes-navigation/geos/geos_3.12.0.bb +++ b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb @@ -8,9 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" SRC_URI[sha256sum] = "d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39" -inherit autotools pkgconfig binconfig - -EXTRA_OECONF += "--enable-inline=no" +inherit cmake pkgconfig binconfig PACKAGES =+ "geoslib ${PN}-c1" From patchwork Wed Jul 5 17:25:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 26918 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 D520BC3DA41 for ; Wed, 5 Jul 2023 17:26:04 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web10.1025.1688577957449091557 for ; Wed, 05 Jul 2023 10:25:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=M8XW+u5f; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6686a05bc66so3715433b3a.1 for ; Wed, 05 Jul 2023 10:25:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688577957; x=1691169957; 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=QC7hbcs07AKHmuD0sTMbukeieO5HcVa3onaJxCJWWDM=; b=M8XW+u5fcNKFOxcDZegLkTt2x/5Rmhqm1A7HgE2Jb/N1rINtAy0I6xcS2c9YaYvAP9 fPlp5oBIqgDJ13J0kkir1ZPg++zpKcNRBvVqN+G4OysUxxNUtR5R6OR2IoZk3bqeX9vy I2WMG+cqBtkg/ph2e93n/22Tk5jieQGRDsqqRxzl+7igDLYQNQbzpMJ+gWDWUXOcp9i8 9X4JBqJbLVz8Nm5Vv4zckTxBNnAQEbk1Poyzmnb0D1MKHVCiP8ukk028B9uHLEDBhcEc vuuhSwKtiUP45AMEP4+O5HsLiu/37SWg9XKH0bmFCgxm+QCwcXiaBmzgp600XglX5Vfn qn0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688577957; x=1691169957; 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=QC7hbcs07AKHmuD0sTMbukeieO5HcVa3onaJxCJWWDM=; b=N2f/SYcF/0QMcgKJhAkQh5M2PL65c3QRpC02sJaWPag+9w5oky8tgfqdMgvwBgx/I8 GwDXr6r5aIgnxveHHil3Ylivc2xLpoGpC3F3t1uWx+ZOSeO8cdl+Kzi7gwhgN20Jpk+h UnDtE9Qrpx1NdrQJotdl6uyibUb70hRq1IK5oFiNJzR3wovk3nHpV6Yluhq3eq8y0Pc4 3hmY3I3u1vkhr8lrG0dTF66/vjMkmcWSJh+0jJn5x7fsquzVZVnT9MU2hQtpOP1lXDrx PxLOVyFBpHT8Vx6sDbS+F1MTk6PvHSG4hzeAEqsQY5BpT1b+tfEXyb6Ygl9H8K2N/j/g ItDg== X-Gm-Message-State: ABy/qLZ8lKkhPvsJZCKoDjOt+toiD18T1w7m/FPEuqgC1Uh8bBz5VTzZ L9GNIDtC2EbnKOjh1LDoqOJ88AvfNT8= X-Google-Smtp-Source: APBJJlFAmwwmMDUMIYCOUU+7IZYZ02VbZhdt27niCvRCT9bZCIaInKQBj0V9hm7oqVvGhuwa7fp/uQ== X-Received: by 2002:a05:6a20:7f93:b0:12f:46ef:a76f with SMTP id d19-20020a056a207f9300b0012f46efa76fmr4832242pzj.41.1688577956545; Wed, 05 Jul 2023 10:25:56 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::81d4]) by smtp.gmail.com with ESMTPSA id w6-20020aa78586000000b0067b384d5955sm13869174pfn.26.2023.07.05.10.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 10:25:55 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/4] pcp: Fix build race Date: Wed, 5 Jul 2023 10:25:50 -0700 Message-ID: <20230705172550.3371930-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705172550.3371930-1-raj.khem@gmail.com> References: <20230705172550.3371930-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 ; Wed, 05 Jul 2023 17:26:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103671 Signed-off-by: Khem Raj --- meta-oe/recipes-support/pcp/pcp.inc | 1 + ...ndency-order-of-header-and-sourcefil.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc index 276be7ffaa..b2d6e130b4 100644 --- a/meta-oe/recipes-support/pcp/pcp.inc +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -9,6 +9,7 @@ COMPATIBLE_HOST:libc-musl = "null" SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ file://0001-configure-Limit-the-header-search-to-sysroot.patch \ + file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ file://config.linux \ " SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee" diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch new file mode 100644 index 0000000000..009dfe2d04 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch @@ -0,0 +1,36 @@ +From c123980d6bf1bc2bf93ee0dd0d7f8fee3d4ddc96 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 5 Jul 2023 08:45:14 -0700 +Subject: [PATCH] htop: Change dependency order of header and sourcefiles + +Fixes build race +| pcp/Platform.h:29:10: fatal error: DiskIOMeter.h: No such file or directory +| 29 | #include "DiskIOMeter.h" +| | ^~~~~~~~~~~~~~~ +| compilation terminated. +| make[3]: *** [: pcp-htop.o] Error 1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/pcp/htop/GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile +index 6b7c0c5..5153c63 100644 +--- a/src/pcp/htop/GNUmakefile ++++ b/src/pcp/htop/GNUmakefile +@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) + CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) + + CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) +-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) +-SUBXFILES = $(SUBCFILES) $(SUBHFILES) ++TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) ++SUBXFILES = $(SUBHFILES) $(SUBCFILES) + CFILES = $(TOPCFILES) $(SUBCFILES) + HFILES = $(TOPHFILES) $(SUBHFILES) + LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ +-- +2.41.0 +