* [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 @ 2021-02-18 19:32 Khem Raj 2021-02-18 19:32 ` [PATCH v3] recipes: Update common-licenses references to match new names Khem Raj 2021-02-23 10:58 ` [oe] [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 Clément Péron 0 siblings, 2 replies; 5+ messages in thread From: Khem Raj @ 2021-02-18 19:32 UTC (permalink / raw) To: openembedded-devel; +Cc: Khem Raj Drop 0001-Fix-build-on-riscv32.patch, its upstreamed Forward port rest of the patches Use OPENSSL_NO_ASM only for armv7+/aarch64 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- v2: Fix wrong detection of platform .../0001-Fix-build-on-riscv32.patch | 65 -------------- ...-Do-not-mix-C-and-C-compiler-options.patch | 86 ++++++++++--------- .../python/python3-grpcio/boring_ssl.patch | 36 ++++++++ .../ppc-boringssl-support.patch | 4 +- .../python3-grpcio/riscv64_support.patch | 4 +- ...cio_1.27.1.bb => python3-grpcio_1.35.0.bb} | 20 +++-- 6 files changed, 98 insertions(+), 117 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch rename meta-python/recipes-devtools/python/{python3-grpcio_1.27.1.bb => python3-grpcio_1.35.0.bb} (55%) diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch deleted file mode 100644 index 920fc1169d..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 29 Apr 2020 15:37:40 -0700 -Subject: [PATCH] Fix build on riscv32 - -Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of -__NR_futex_time64 for rv32, since there calls dont exist for rv32 - -Also recognise rv32 as a new 32bit platform - -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - absl/base/internal/direct_mmap.h | 5 +++++ - absl/base/internal/spinlock_linux.inc | 4 ++++ - absl/synchronization/internal/waiter.cc | 4 ++++ - 3 files changed, 13 insertions(+) - ---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h -+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h -@@ -26,6 +26,10 @@ - - #ifdef __linux__ - -+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32 -+# define __NR_mmap __NR_mmap2 -+#endif -+ - #include <sys/types.h> - #ifdef __BIONIC__ - #include <sys/syscall.h> -@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ - (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ - (defined(__PPC__) && !defined(__PPC64__)) || \ -+ (defined(__riscv) && __riscv_xlen == 32) || \ - (defined(__s390__) && !defined(__s390x__)) - // On these architectures, implement mmap with mmap2. - static int pagesize = 0; ---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc -+++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc -@@ -14,6 +14,10 @@ - // - // This file is a Linux-specific part of spinlock_wait.cc - -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 -+# define __NR_futex __NR_futex_time64 -+#endif -+ - #include <linux/futex.h> - #include <sys/syscall.h> - #include <unistd.h> ---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc -+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc -@@ -24,6 +24,10 @@ - #include <unistd.h> - #endif - -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 -+# define __NR_futex __NR_futex_time64 -+#endif -+ - #ifdef __linux__ - #include <linux/futex.h> - #include <sys/syscall.h> 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 bff50a0a11..373669461b 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 @@ -1,26 +1,18 @@ -From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001 +From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 Aug 2017 09:04:07 -0700 +Date: Wed, 17 Feb 2021 13:30:23 -0800 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX so using -std=c++11 or -std=gnu99 together will cause build time errors espcially with clang -error: invalid argument '-std=gnu99' not allowed with 'C++' - -gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) - as well clang default to these standards mode or newer -anyway - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -1. Keep '-std=c++11' and '-std=gnu99' to fix native build error +Keep '-std=c++11' to fix native build error with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang we will remove them through GRPC_PYTHON_CFLAGS at do_compile in bb recipe. -2. While export CC="gcc ", cc_args is None, it will +While export CC="gcc ", cc_args is None, it will cause subprocess.Popen always return 1. On centos 8, if you don't install package libatomic, there will be a native build error `cannot find /usr/lib64/libatomic.so.1.2.0'. @@ -28,47 +20,57 @@ install package libatomic, there will be a native build error Add no harm '-g' to cc_args if cc_args is empty. Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - setup.py | 6 +++++- + setup.py | 9 ++++++--- src/python/grpcio/commands.py | 5 ++++- - 2 files changed, 9 insertions(+), 2 deletions(-) + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index e950057..1b68221 100644 +index 4b8c9d4..271b7b1 100644 --- a/setup.py +++ b/setup.py -@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get( - - def check_linker_need_libatomic(): - """Test if linker on system needs libatomic.""" -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' -+ if not cc_args: -+ cc_args = "-g" +@@ -172,8 +172,11 @@ def check_linker_need_libatomic(): + """Test if linker on system needs libatomic.""" + code_test = (b'#include <atomic>\n' + + b'int main() { return std::atomic<int64_t>{}; }') +- cxx = os.environ.get('CXX', 'c++') +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], ++ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' ++ if not cxx_args: ++ cxx_args = "-g" + - code_test = (b'#include <atomic>\n' + - b'int main() { return std::atomic<int64_t>{}; }') -- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'], - stdin=PIPE, - stdout=PIPE, - stderr=PIPE) ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) +@@ -183,7 +186,7 @@ def check_linker_need_libatomic(): + # Double-check to see if -latomic actually can solve the problem. + # https://github.com/grpc/grpc/issues/22491 + cpp_test = subprocess.Popen( +- [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'], ++ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py -index 064dda9..a75d8b9 100644 +index a8b2ff5..b928201 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py -@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext): - when invoked in C mode. GCC is okay with this, while clang is not. +@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext): """ - # TODO(lidiz) Remove the generated a.out for success tests. -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' -+ if not cc_args: -+ cc_args = "-g" -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + try: + # TODO(lidiz) Remove the generated a.out for success tests. +- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], ++ cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' ++ if not cc_args: ++ cc_args = "-g" ++ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) -- -2.7.4 +2.30.1 diff --git a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch new file mode 100644 index 0000000000..65db4a6ed4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch @@ -0,0 +1,36 @@ +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 <raj.khem@gmail.com> +--- a/setup.py ++++ b/setup.py +@@ -109,6 +109,8 @@ CLASSIFIERS = [ + BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', + True) + ++BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM', ++ True) + # Environment variable to determine whether or not the Cython extension should + # *use* Cython or use the generated C files. Note that this requires the C files + # to have been generated by building first *with* Cython support. Even if this +@@ -306,15 +308,15 @@ asm_key = '' + if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL: + LINUX_X86_64 = 'linux-x86_64' + LINUX_ARM = 'linux-arm' +- if LINUX_X86_64 == util.get_platform(): ++ if LINUX_X86_64 == BORING_SSL_PLATFORM: + asm_key = 'crypto_linux_x86_64' +- elif LINUX_ARM == util.get_platform(): ++ elif LINUX_ARM == BORING_SSL_PLATFORM: + asm_key = 'crypto_linux_arm' +- elif "mac" in util.get_platform() and "x86_64" in util.get_platform(): ++ elif "mac" in BORING_SSL_PLATFORM and "x86_64" in BORING_SSL_PLATFORM: + asm_key = 'crypto_mac_x86_64' + else: + print("ASM Builds for BoringSSL currently not supported on:", +- util.get_platform()) ++ BORING_SSL_PLATFORM) + if asm_key: + asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key] + else: 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 8ac2aef8c4..dadd3da85e 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 @@ -3,8 +3,8 @@ Let boringSSL compile on ppc32 bit Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/third_party/boringssl/include/openssl/base.h -+++ b/third_party/boringssl/include/openssl/base.h +--- 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 diff --git a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch index 8c9ffa21b7..7e071ae1e6 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch @@ -2,8 +2,8 @@ Add RISC-V 64bit support Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/third_party/boringssl/include/openssl/base.h -+++ b/third_party/boringssl/include/openssl/base.h +--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h ++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h @@ -108,6 +108,14 @@ extern "C" { #elif defined(__mips__) && defined(__LP64__) #define OPENSSL_64_BIT diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb similarity index 55% rename from meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb rename to meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb index 129bb35bcc..2c137f6ce7 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb @@ -9,10 +9,9 @@ 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://riscv64_support.patch \ - file://0001-Fix-build-on-riscv32.patch \ + file://boring_ssl.patch \ " -SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" -SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4" +SRC_URI[sha256sum] = "7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c" RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ @@ -24,9 +23,18 @@ inherit pypi export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" -do_compile_prepend_toolchain-clang() { - export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions' -} +BORING_SSL_PLATFORM_arm = "linux-arm" +BORING_SSL_PLATFORM_x86-64 = "linux-x86_64" +BORING_SSL_PLATFORM ?= "unsupported" +export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" + +BORING_SSL_x86-64 = "1" +BORING_SSL_arm = "1" +BORING_SSL ?= "0" +export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" + +GRPC_CFLAGS_append_toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" CLEANBROKEN = "1" -- 2.30.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3] recipes: Update common-licenses references to match new names 2021-02-18 19:32 [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 Khem Raj @ 2021-02-18 19:32 ` Khem Raj 2021-02-23 10:58 ` [oe] [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 Clément Péron 1 sibling, 0 replies; 5+ messages in thread From: Khem Raj @ 2021-02-18 19:32 UTC (permalink / raw) To: openembedded-devel; +Cc: Khem Raj The licenses were renamed to match their SPDX names, fix the references in LIC_FILES_CHKSUM Correct the checksums where they were wrong Signed-off-by: Khem Raj <raj.khem@gmail.com> --- v3: Update checksums where needed meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 4 ++-- meta-networking/recipes-support/arptables/arptables_git.bb | 2 +- meta-networking/recipes-support/ncp/ncp_1.2.4.bb | 2 +- .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +- .../recipes-extended/inputattach-config/inputattach-config.bb | 2 +- .../gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++-- .../recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb | 2 +- meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb | 2 +- meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb | 4 ++-- meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb index 1a982368ec..166bf57279 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb @@ -3,8 +3,8 @@ SECTION = "console/network" LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " + file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ + file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" SAMBA_MIRROR = "http://samba.org/samba/ftp" MIRRORS += "\ diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index c02a19944d..5afec7663a 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Administration tool for arp packet filtering" SECTION = "net" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" PV = "0.0.5+git${SRCPV}" diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb index f42223b1f8..a2f0ccc069 100644 --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \ one: you don't have to type the coordinates of your peer." HOMEPAGE = "http://www.fefe.de/ncp" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "libowfat" SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2" diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index ae1463942a..d93a7f7239 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -3,7 +3,7 @@ SECTION = "console/utils" LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ - file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb index 68beec670b..3933355abf 100644 --- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb +++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb @@ -1,6 +1,6 @@ SUMMARY = "inputattach configuration file" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://inputattach.conf" diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index d6da51b0de..f7fbedd6e0 100644 --- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb @@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \ that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \ it requires libxml2 and python 2 at the same time, which can no longer be satisfied. " LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" SRC_URI = "file://gnome-doc-utils.m4" PROVIDES = "gnome-doc-utils" diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb index 25e01fac0c..38598e2b49 100644 --- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb +++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb @@ -12,7 +12,7 @@ SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Config-AutoConf-${PV}.tar.gz" diff --git a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb index 3678ad7621..415652c1ed 100644 --- a/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb +++ b/meta-perl/recipes-perl/libfile/libfile-slurper-perl_0.012.bb @@ -9,7 +9,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" HOMEPAGE= "https://metacpan.org/release/File-Slurper" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/File-Slurper-${PV}.tar.gz" diff --git a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb index a1bb4a399e..c0113b4fd9 100644 --- a/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb +++ b/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb @@ -24,8 +24,8 @@ RDEPENDS_${PN} += "\ SRC_URI = "${CPAN_MIRROR}/authors/id/R/RE/REHSACK/Unix-Statgrab-${PV}.tar.gz" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ - file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d \ - file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ + file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61 \ + file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ " SRC_URI[md5sum] = "a6bc06b3f7749f7d77a2b1bd13402821" diff --git a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb index f2dda194dc..7cd07b2c0b 100644 --- a/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb +++ b/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb @@ -15,7 +15,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" HOMEPAGE= "https://metacpan.org/release/Test-Warnings" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" +file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" SRC_URI = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-${PV}.tar.gz" -- 2.30.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 2021-02-18 19:32 [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 Khem Raj 2021-02-18 19:32 ` [PATCH v3] recipes: Update common-licenses references to match new names Khem Raj @ 2021-02-23 10:58 ` Clément Péron 2021-02-23 15:56 ` Khem Raj 1 sibling, 1 reply; 5+ messages in thread From: Clément Péron @ 2021-02-23 10:58 UTC (permalink / raw) To: Khem Raj; +Cc: openembeded-devel Hi Khem, On Thu, 18 Feb 2021 at 20:32, Khem Raj <raj.khem@gmail.com> wrote: > > Drop 0001-Fix-build-on-riscv32.patch, its upstreamed > Forward port rest of the patches > Use OPENSSL_NO_ASM only for armv7+/aarch64 Should we not also enable these flags?: GRPC_PYTHON_BUILD_SYSTEM_RE2 GRPC_PYTHON_BUILD_SYSTEM_CARES GRPC_PYTHON_BUILD_SYSTEM_ZLIB To avoid building a different version of RE2/C-Ares of Zlib than the one built by the system ? Regards, Clement > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > v2: Fix wrong detection of platform > > .../0001-Fix-build-on-riscv32.patch | 65 -------------- > ...-Do-not-mix-C-and-C-compiler-options.patch | 86 ++++++++++--------- > .../python/python3-grpcio/boring_ssl.patch | 36 ++++++++ > .../ppc-boringssl-support.patch | 4 +- > .../python3-grpcio/riscv64_support.patch | 4 +- > ...cio_1.27.1.bb => python3-grpcio_1.35.0.bb} | 20 +++-- > 6 files changed, 98 insertions(+), 117 deletions(-) > delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > rename meta-python/recipes-devtools/python/{python3-grpcio_1.27.1.bb => python3-grpcio_1.35.0.bb} (55%) > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > deleted file mode 100644 > index 920fc1169d..0000000000 > --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > +++ /dev/null > @@ -1,65 +0,0 @@ > -From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Wed, 29 Apr 2020 15:37:40 -0700 > -Subject: [PATCH] Fix build on riscv32 > - > -Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of > -__NR_futex_time64 for rv32, since there calls dont exist for rv32 > - > -Also recognise rv32 as a new 32bit platform > - > -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - absl/base/internal/direct_mmap.h | 5 +++++ > - absl/base/internal/spinlock_linux.inc | 4 ++++ > - absl/synchronization/internal/waiter.cc | 4 ++++ > - 3 files changed, 13 insertions(+) > - > ---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h > -+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h > -@@ -26,6 +26,10 @@ > - > - #ifdef __linux__ > - > -+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32 > -+# define __NR_mmap __NR_mmap2 > -+#endif > -+ > - #include <sys/types.h> > - #ifdef __BIONIC__ > - #include <sys/syscall.h> > -@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz > - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ > - (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ > - (defined(__PPC__) && !defined(__PPC64__)) || \ > -+ (defined(__riscv) && __riscv_xlen == 32) || \ > - (defined(__s390__) && !defined(__s390x__)) > - // On these architectures, implement mmap with mmap2. > - static int pagesize = 0; > ---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc > -+++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc > -@@ -14,6 +14,10 @@ > - // > - // This file is a Linux-specific part of spinlock_wait.cc > - > -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 > -+# define __NR_futex __NR_futex_time64 > -+#endif > -+ > - #include <linux/futex.h> > - #include <sys/syscall.h> > - #include <unistd.h> > ---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc > -+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc > -@@ -24,6 +24,10 @@ > - #include <unistd.h> > - #endif > - > -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 > -+# define __NR_futex __NR_futex_time64 > -+#endif > -+ > - #ifdef __linux__ > - #include <linux/futex.h> > - #include <sys/syscall.h> > 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 bff50a0a11..373669461b 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 > @@ -1,26 +1,18 @@ > -From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001 > +From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001 > From: Khem Raj <raj.khem@gmail.com> > -Date: Fri, 4 Aug 2017 09:04:07 -0700 > +Date: Wed, 17 Feb 2021 13:30:23 -0800 > Subject: [PATCH] setup.py: Do not mix C and C++ compiler options > > EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX > so using -std=c++11 or -std=gnu99 together will cause > build time errors espcially with clang > > -error: invalid argument '-std=gnu99' not allowed with 'C++' > - > -gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) > - as well clang default to these standards mode or newer > -anyway > - > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > - > -1. Keep '-std=c++11' and '-std=gnu99' to fix native build error > +Keep '-std=c++11' to fix native build error > with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang > we will remove them through GRPC_PYTHON_CFLAGS at do_compile > in bb recipe. > > -2. While export CC="gcc ", cc_args is None, it will > +While export CC="gcc ", cc_args is None, it will > cause subprocess.Popen always return 1. On centos 8, if you don't > install package libatomic, there will be a native build error > `cannot find /usr/lib64/libatomic.so.1.2.0'. > @@ -28,47 +20,57 @@ install package libatomic, there will be a native build error > Add no harm '-g' to cc_args if cc_args is empty. > > Upstream-Status: Inappropriate [oe specific] > + > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > - setup.py | 6 +++++- > + setup.py | 9 ++++++--- > src/python/grpcio/commands.py | 5 ++++- > - 2 files changed, 9 insertions(+), 2 deletions(-) > + 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/setup.py b/setup.py > -index e950057..1b68221 100644 > +index 4b8c9d4..271b7b1 100644 > --- a/setup.py > +++ b/setup.py > -@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get( > - > - def check_linker_need_libatomic(): > - """Test if linker on system needs libatomic.""" > -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > -+ if not cc_args: > -+ cc_args = "-g" > +@@ -172,8 +172,11 @@ def check_linker_need_libatomic(): > + """Test if linker on system needs libatomic.""" > + code_test = (b'#include <atomic>\n' + > + b'int main() { return std::atomic<int64_t>{}; }') > +- cxx = os.environ.get('CXX', 'c++') > +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], > ++ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' > ++ if not cxx_args: > ++ cxx_args = "-g" > + > - code_test = (b'#include <atomic>\n' + > - b'int main() { return std::atomic<int64_t>{}; }') > -- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], > -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'], > - stdin=PIPE, > - stdout=PIPE, > - stderr=PIPE) > ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], > + stdin=PIPE, > + stdout=PIPE, > + stderr=PIPE) > +@@ -183,7 +186,7 @@ def check_linker_need_libatomic(): > + # Double-check to see if -latomic actually can solve the problem. > + # https://github.com/grpc/grpc/issues/22491 > + cpp_test = subprocess.Popen( > +- [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'], > ++ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'], > + stdin=PIPE, > + stdout=PIPE, > + stderr=PIPE) > diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py > -index 064dda9..a75d8b9 100644 > +index a8b2ff5..b928201 100644 > --- a/src/python/grpcio/commands.py > +++ b/src/python/grpcio/commands.py > -@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext): > - when invoked in C mode. GCC is okay with this, while clang is not. > +@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext): > """ > - # TODO(lidiz) Remove the generated a.out for success tests. > -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], > -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > -+ if not cc_args: > -+ cc_args = "-g" > -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], > - stdin=subprocess.PIPE, > - stdout=subprocess.PIPE, > - stderr=subprocess.PIPE) > + try: > + # TODO(lidiz) Remove the generated a.out for success tests. > +- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], > ++ cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > ++ if not cc_args: > ++ cc_args = "-g" > ++ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'], > + stdin=subprocess.PIPE, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE) > -- > -2.7.4 > +2.30.1 > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > new file mode 100644 > index 0000000000..65db4a6ed4 > --- /dev/null > +++ b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > @@ -0,0 +1,36 @@ > +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 <raj.khem@gmail.com> > +--- a/setup.py > ++++ b/setup.py > +@@ -109,6 +109,8 @@ CLASSIFIERS = [ > + BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', > + True) > + > ++BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM', > ++ True) > + # Environment variable to determine whether or not the Cython extension should > + # *use* Cython or use the generated C files. Note that this requires the C files > + # to have been generated by building first *with* Cython support. Even if this > +@@ -306,15 +308,15 @@ asm_key = '' > + if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL: > + LINUX_X86_64 = 'linux-x86_64' > + LINUX_ARM = 'linux-arm' > +- if LINUX_X86_64 == util.get_platform(): > ++ if LINUX_X86_64 == BORING_SSL_PLATFORM: > + asm_key = 'crypto_linux_x86_64' > +- elif LINUX_ARM == util.get_platform(): > ++ elif LINUX_ARM == BORING_SSL_PLATFORM: > + asm_key = 'crypto_linux_arm' > +- elif "mac" in util.get_platform() and "x86_64" in util.get_platform(): > ++ elif "mac" in BORING_SSL_PLATFORM and "x86_64" in BORING_SSL_PLATFORM: > + asm_key = 'crypto_mac_x86_64' > + else: > + print("ASM Builds for BoringSSL currently not supported on:", > +- util.get_platform()) > ++ BORING_SSL_PLATFORM) > + if asm_key: > + asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key] > + else: > 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 8ac2aef8c4..dadd3da85e 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 > @@ -3,8 +3,8 @@ Let boringSSL compile on ppc32 bit > Upstream-Status: Pending > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- a/third_party/boringssl/include/openssl/base.h > -+++ b/third_party/boringssl/include/openssl/base.h > +--- 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 > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > index 8c9ffa21b7..7e071ae1e6 100644 > --- a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > +++ b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > @@ -2,8 +2,8 @@ Add RISC-V 64bit support > > Upstream-Status: Pending > Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- a/third_party/boringssl/include/openssl/base.h > -+++ b/third_party/boringssl/include/openssl/base.h > +--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h > ++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h > @@ -108,6 +108,14 @@ extern "C" { > #elif defined(__mips__) && defined(__LP64__) > #define OPENSSL_64_BIT > diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > similarity index 55% > rename from meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb > rename to meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > index 129bb35bcc..2c137f6ce7 100644 > --- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb > +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > @@ -9,10 +9,9 @@ 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://riscv64_support.patch \ > - file://0001-Fix-build-on-riscv32.patch \ > + file://boring_ssl.patch \ > " > -SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" > -SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4" > +SRC_URI[sha256sum] = "7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c" > > RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ > ${PYTHON_PN}-setuptools \ > @@ -24,9 +23,18 @@ inherit pypi > > export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" > > -do_compile_prepend_toolchain-clang() { > - export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions' > -} > +BORING_SSL_PLATFORM_arm = "linux-arm" > +BORING_SSL_PLATFORM_x86-64 = "linux-x86_64" > +BORING_SSL_PLATFORM ?= "unsupported" > +export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" > + > +BORING_SSL_x86-64 = "1" > +BORING_SSL_arm = "1" > +BORING_SSL ?= "0" > +export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" > + > +GRPC_CFLAGS_append_toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" > +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" > > CLEANBROKEN = "1" > > -- > 2.30.1 > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 2021-02-23 10:58 ` [oe] [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 Clément Péron @ 2021-02-23 15:56 ` Khem Raj 2021-02-24 9:56 ` Clément Péron 0 siblings, 1 reply; 5+ messages in thread From: Khem Raj @ 2021-02-23 15:56 UTC (permalink / raw) To: Clément Péron; +Cc: openembeded-devel On Tue, Feb 23, 2021 at 2:59 AM Clément Péron <peron.clem@gmail.com> wrote: > > Hi Khem, > > On Thu, 18 Feb 2021 at 20:32, Khem Raj <raj.khem@gmail.com> wrote: > > > > Drop 0001-Fix-build-on-riscv32.patch, its upstreamed > > Forward port rest of the patches > > Use OPENSSL_NO_ASM only for armv7+/aarch64 > > Should we not also enable these flags?: > GRPC_PYTHON_BUILD_SYSTEM_RE2 > GRPC_PYTHON_BUILD_SYSTEM_CARES > GRPC_PYTHON_BUILD_SYSTEM_ZLIB > > To avoid building a different version of RE2/C-Ares of Zlib than the > one built by the system ? > perhaps we should please test such a change and submit if it works > Regards, > Clement > > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- > > v2: Fix wrong detection of platform > > > > .../0001-Fix-build-on-riscv32.patch | 65 -------------- > > ...-Do-not-mix-C-and-C-compiler-options.patch | 86 ++++++++++--------- > > .../python/python3-grpcio/boring_ssl.patch | 36 ++++++++ > > .../ppc-boringssl-support.patch | 4 +- > > .../python3-grpcio/riscv64_support.patch | 4 +- > > ...cio_1.27.1.bb => python3-grpcio_1.35.0.bb} | 20 +++-- > > 6 files changed, 98 insertions(+), 117 deletions(-) > > delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > > create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > > rename meta-python/recipes-devtools/python/{python3-grpcio_1.27.1.bb => python3-grpcio_1.35.0.bb} (55%) > > > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > > deleted file mode 100644 > > index 920fc1169d..0000000000 > > --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > > +++ /dev/null > > @@ -1,65 +0,0 @@ > > -From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001 > > -From: Khem Raj <raj.khem@gmail.com> > > -Date: Wed, 29 Apr 2020 15:37:40 -0700 > > -Subject: [PATCH] Fix build on riscv32 > > - > > -Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of > > -__NR_futex_time64 for rv32, since there calls dont exist for rv32 > > - > > -Also recognise rv32 as a new 32bit platform > > - > > -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - absl/base/internal/direct_mmap.h | 5 +++++ > > - absl/base/internal/spinlock_linux.inc | 4 ++++ > > - absl/synchronization/internal/waiter.cc | 4 ++++ > > - 3 files changed, 13 insertions(+) > > - > > ---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h > > -+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h > > -@@ -26,6 +26,10 @@ > > - > > - #ifdef __linux__ > > - > > -+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32 > > -+# define __NR_mmap __NR_mmap2 > > -+#endif > > -+ > > - #include <sys/types.h> > > - #ifdef __BIONIC__ > > - #include <sys/syscall.h> > > -@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz > > - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ > > - (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ > > - (defined(__PPC__) && !defined(__PPC64__)) || \ > > -+ (defined(__riscv) && __riscv_xlen == 32) || \ > > - (defined(__s390__) && !defined(__s390x__)) > > - // On these architectures, implement mmap with mmap2. > > - static int pagesize = 0; > > ---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc > > -+++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc > > -@@ -14,6 +14,10 @@ > > - // > > - // This file is a Linux-specific part of spinlock_wait.cc > > - > > -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 > > -+# define __NR_futex __NR_futex_time64 > > -+#endif > > -+ > > - #include <linux/futex.h> > > - #include <sys/syscall.h> > > - #include <unistd.h> > > ---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc > > -+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc > > -@@ -24,6 +24,10 @@ > > - #include <unistd.h> > > - #endif > > - > > -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 > > -+# define __NR_futex __NR_futex_time64 > > -+#endif > > -+ > > - #ifdef __linux__ > > - #include <linux/futex.h> > > - #include <sys/syscall.h> > > 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 bff50a0a11..373669461b 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 > > @@ -1,26 +1,18 @@ > > -From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001 > > +From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001 > > From: Khem Raj <raj.khem@gmail.com> > > -Date: Fri, 4 Aug 2017 09:04:07 -0700 > > +Date: Wed, 17 Feb 2021 13:30:23 -0800 > > Subject: [PATCH] setup.py: Do not mix C and C++ compiler options > > > > EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX > > so using -std=c++11 or -std=gnu99 together will cause > > build time errors espcially with clang > > > > -error: invalid argument '-std=gnu99' not allowed with 'C++' > > - > > -gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) > > - as well clang default to these standards mode or newer > > -anyway > > - > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > - > > -1. Keep '-std=c++11' and '-std=gnu99' to fix native build error > > +Keep '-std=c++11' to fix native build error > > with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang > > we will remove them through GRPC_PYTHON_CFLAGS at do_compile > > in bb recipe. > > > > -2. While export CC="gcc ", cc_args is None, it will > > +While export CC="gcc ", cc_args is None, it will > > cause subprocess.Popen always return 1. On centos 8, if you don't > > install package libatomic, there will be a native build error > > `cannot find /usr/lib64/libatomic.so.1.2.0'. > > @@ -28,47 +20,57 @@ install package libatomic, there will be a native build error > > Add no harm '-g' to cc_args if cc_args is empty. > > > > Upstream-Status: Inappropriate [oe specific] > > + > > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > > --- > > - setup.py | 6 +++++- > > + setup.py | 9 ++++++--- > > src/python/grpcio/commands.py | 5 ++++- > > - 2 files changed, 9 insertions(+), 2 deletions(-) > > + 2 files changed, 10 insertions(+), 4 deletions(-) > > > > diff --git a/setup.py b/setup.py > > -index e950057..1b68221 100644 > > +index 4b8c9d4..271b7b1 100644 > > --- a/setup.py > > +++ b/setup.py > > -@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get( > > - > > - def check_linker_need_libatomic(): > > - """Test if linker on system needs libatomic.""" > > -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > > -+ if not cc_args: > > -+ cc_args = "-g" > > +@@ -172,8 +172,11 @@ def check_linker_need_libatomic(): > > + """Test if linker on system needs libatomic.""" > > + code_test = (b'#include <atomic>\n' + > > + b'int main() { return std::atomic<int64_t>{}; }') > > +- cxx = os.environ.get('CXX', 'c++') > > +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], > > ++ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' > > ++ if not cxx_args: > > ++ cxx_args = "-g" > > + > > - code_test = (b'#include <atomic>\n' + > > - b'int main() { return std::atomic<int64_t>{}; }') > > -- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], > > -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'], > > - stdin=PIPE, > > - stdout=PIPE, > > - stderr=PIPE) > > ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], > > + stdin=PIPE, > > + stdout=PIPE, > > + stderr=PIPE) > > +@@ -183,7 +186,7 @@ def check_linker_need_libatomic(): > > + # Double-check to see if -latomic actually can solve the problem. > > + # https://github.com/grpc/grpc/issues/22491 > > + cpp_test = subprocess.Popen( > > +- [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'], > > ++ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'], > > + stdin=PIPE, > > + stdout=PIPE, > > + stderr=PIPE) > > diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py > > -index 064dda9..a75d8b9 100644 > > +index a8b2ff5..b928201 100644 > > --- a/src/python/grpcio/commands.py > > +++ b/src/python/grpcio/commands.py > > -@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext): > > - when invoked in C mode. GCC is okay with this, while clang is not. > > +@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext): > > """ > > - # TODO(lidiz) Remove the generated a.out for success tests. > > -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], > > -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > > -+ if not cc_args: > > -+ cc_args = "-g" > > -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], > > - stdin=subprocess.PIPE, > > - stdout=subprocess.PIPE, > > - stderr=subprocess.PIPE) > > + try: > > + # TODO(lidiz) Remove the generated a.out for success tests. > > +- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], > > ++ cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > > ++ if not cc_args: > > ++ cc_args = "-g" > > ++ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'], > > + stdin=subprocess.PIPE, > > + stdout=subprocess.PIPE, > > + stderr=subprocess.PIPE) > > -- > > -2.7.4 > > +2.30.1 > > > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > > new file mode 100644 > > index 0000000000..65db4a6ed4 > > --- /dev/null > > +++ b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > > @@ -0,0 +1,36 @@ > > +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 <raj.khem@gmail.com> > > +--- a/setup.py > > ++++ b/setup.py > > +@@ -109,6 +109,8 @@ CLASSIFIERS = [ > > + BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', > > + True) > > + > > ++BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM', > > ++ True) > > + # Environment variable to determine whether or not the Cython extension should > > + # *use* Cython or use the generated C files. Note that this requires the C files > > + # to have been generated by building first *with* Cython support. Even if this > > +@@ -306,15 +308,15 @@ asm_key = '' > > + if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL: > > + LINUX_X86_64 = 'linux-x86_64' > > + LINUX_ARM = 'linux-arm' > > +- if LINUX_X86_64 == util.get_platform(): > > ++ if LINUX_X86_64 == BORING_SSL_PLATFORM: > > + asm_key = 'crypto_linux_x86_64' > > +- elif LINUX_ARM == util.get_platform(): > > ++ elif LINUX_ARM == BORING_SSL_PLATFORM: > > + asm_key = 'crypto_linux_arm' > > +- elif "mac" in util.get_platform() and "x86_64" in util.get_platform(): > > ++ elif "mac" in BORING_SSL_PLATFORM and "x86_64" in BORING_SSL_PLATFORM: > > + asm_key = 'crypto_mac_x86_64' > > + else: > > + print("ASM Builds for BoringSSL currently not supported on:", > > +- util.get_platform()) > > ++ BORING_SSL_PLATFORM) > > + if asm_key: > > + asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key] > > + else: > > 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 8ac2aef8c4..dadd3da85e 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 > > @@ -3,8 +3,8 @@ Let boringSSL compile on ppc32 bit > > Upstream-Status: Pending > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > > ---- a/third_party/boringssl/include/openssl/base.h > > -+++ b/third_party/boringssl/include/openssl/base.h > > +--- 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 > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > > index 8c9ffa21b7..7e071ae1e6 100644 > > --- a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > > +++ b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > > @@ -2,8 +2,8 @@ Add RISC-V 64bit support > > > > Upstream-Status: Pending > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- a/third_party/boringssl/include/openssl/base.h > > -+++ b/third_party/boringssl/include/openssl/base.h > > +--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h > > ++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h > > @@ -108,6 +108,14 @@ extern "C" { > > #elif defined(__mips__) && defined(__LP64__) > > #define OPENSSL_64_BIT > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > > similarity index 55% > > rename from meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb > > rename to meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > > index 129bb35bcc..2c137f6ce7 100644 > > --- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb > > +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > > @@ -9,10 +9,9 @@ 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://riscv64_support.patch \ > > - file://0001-Fix-build-on-riscv32.patch \ > > + file://boring_ssl.patch \ > > " > > -SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" > > -SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4" > > +SRC_URI[sha256sum] = "7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c" > > > > RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ > > ${PYTHON_PN}-setuptools \ > > @@ -24,9 +23,18 @@ inherit pypi > > > > export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" > > > > -do_compile_prepend_toolchain-clang() { > > - export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions' > > -} > > +BORING_SSL_PLATFORM_arm = "linux-arm" > > +BORING_SSL_PLATFORM_x86-64 = "linux-x86_64" > > +BORING_SSL_PLATFORM ?= "unsupported" > > +export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" > > + > > +BORING_SSL_x86-64 = "1" > > +BORING_SSL_arm = "1" > > +BORING_SSL ?= "0" > > +export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" > > + > > +GRPC_CFLAGS_append_toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" > > +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" > > > > CLEANBROKEN = "1" > > > > -- > > 2.30.1 > > > > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe] [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 2021-02-23 15:56 ` Khem Raj @ 2021-02-24 9:56 ` Clément Péron 0 siblings, 0 replies; 5+ messages in thread From: Clément Péron @ 2021-02-24 9:56 UTC (permalink / raw) To: Khem Raj; +Cc: openembeded-devel Hi Khem, On Tue, 23 Feb 2021 at 16:56, Khem Raj <raj.khem@gmail.com> wrote: > > On Tue, Feb 23, 2021 at 2:59 AM Clément Péron <peron.clem@gmail.com> wrote: > > > > Hi Khem, > > > > On Thu, 18 Feb 2021 at 20:32, Khem Raj <raj.khem@gmail.com> wrote: > > > > > > Drop 0001-Fix-build-on-riscv32.patch, its upstreamed > > > Forward port rest of the patches > > > Use OPENSSL_NO_ASM only for armv7+/aarch64 > > > > Should we not also enable these flags?: > > GRPC_PYTHON_BUILD_SYSTEM_RE2 > > GRPC_PYTHON_BUILD_SYSTEM_CARES > > GRPC_PYTHON_BUILD_SYSTEM_ZLIB > > > > To avoid building a different version of RE2/C-Ares of Zlib than the > > one built by the system ? > > > > perhaps we should please test such a change and submit if it works Ok I will test and send a patch if it works. But actually i'm stuck with the gRPC bump to 1.35.0 that trig an error due to : The imported target "gRPC::grpc_cpp_plugin" references the file | | "/xxxx/recipe-sysroot/usr/bin/grpc_cpp_plugin" | | but this file does not exist. Possible reasons include: | | * The file was deleted, renamed, or moved to another location. | | * An install or uninstall procedure did not complete successfully. | | * The installation package was faulty and contained I would also like to add a grpc-helloworld app example but I don't know how to fix this issue :( This error is coming from the find_package(gRPC CONFIG REQUIRED) https://github.com/grpc/grpc/blob/master/examples/cpp/cmake/common.cmake#L114 Regards, Clement > > > Regards, > > Clement > > > > > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > --- > > > v2: Fix wrong detection of platform > > > > > > .../0001-Fix-build-on-riscv32.patch | 65 -------------- > > > ...-Do-not-mix-C-and-C-compiler-options.patch | 86 ++++++++++--------- > > > .../python/python3-grpcio/boring_ssl.patch | 36 ++++++++ > > > .../ppc-boringssl-support.patch | 4 +- > > > .../python3-grpcio/riscv64_support.patch | 4 +- > > > ...cio_1.27.1.bb => python3-grpcio_1.35.0.bb} | 20 +++-- > > > 6 files changed, 98 insertions(+), 117 deletions(-) > > > delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > > > create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > > > rename meta-python/recipes-devtools/python/{python3-grpcio_1.27.1.bb => python3-grpcio_1.35.0.bb} (55%) > > > > > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > > > deleted file mode 100644 > > > index 920fc1169d..0000000000 > > > --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Fix-build-on-riscv32.patch > > > +++ /dev/null > > > @@ -1,65 +0,0 @@ > > > -From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001 > > > -From: Khem Raj <raj.khem@gmail.com> > > > -Date: Wed, 29 Apr 2020 15:37:40 -0700 > > > -Subject: [PATCH] Fix build on riscv32 > > > - > > > -Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of > > > -__NR_futex_time64 for rv32, since there calls dont exist for rv32 > > > - > > > -Also recognise rv32 as a new 32bit platform > > > - > > > -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675] > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- > > > - absl/base/internal/direct_mmap.h | 5 +++++ > > > - absl/base/internal/spinlock_linux.inc | 4 ++++ > > > - absl/synchronization/internal/waiter.cc | 4 ++++ > > > - 3 files changed, 13 insertions(+) > > > - > > > ---- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h > > > -+++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h > > > -@@ -26,6 +26,10 @@ > > > - > > > - #ifdef __linux__ > > > - > > > -+#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32 > > > -+# define __NR_mmap __NR_mmap2 > > > -+#endif > > > -+ > > > - #include <sys/types.h> > > > - #ifdef __BIONIC__ > > > - #include <sys/syscall.h> > > > -@@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz > > > - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ > > > - (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ > > > - (defined(__PPC__) && !defined(__PPC64__)) || \ > > > -+ (defined(__riscv) && __riscv_xlen == 32) || \ > > > - (defined(__s390__) && !defined(__s390x__)) > > > - // On these architectures, implement mmap with mmap2. > > > - static int pagesize = 0; > > > ---- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc > > > -+++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc > > > -@@ -14,6 +14,10 @@ > > > - // > > > - // This file is a Linux-specific part of spinlock_wait.cc > > > - > > > -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 > > > -+# define __NR_futex __NR_futex_time64 > > > -+#endif > > > -+ > > > - #include <linux/futex.h> > > > - #include <sys/syscall.h> > > > - #include <unistd.h> > > > ---- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc > > > -+++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc > > > -@@ -24,6 +24,10 @@ > > > - #include <unistd.h> > > > - #endif > > > - > > > -+#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 > > > -+# define __NR_futex __NR_futex_time64 > > > -+#endif > > > -+ > > > - #ifdef __linux__ > > > - #include <linux/futex.h> > > > - #include <sys/syscall.h> > > > 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 bff50a0a11..373669461b 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 > > > @@ -1,26 +1,18 @@ > > > -From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001 > > > +From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001 > > > From: Khem Raj <raj.khem@gmail.com> > > > -Date: Fri, 4 Aug 2017 09:04:07 -0700 > > > +Date: Wed, 17 Feb 2021 13:30:23 -0800 > > > Subject: [PATCH] setup.py: Do not mix C and C++ compiler options > > > > > > EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX > > > so using -std=c++11 or -std=gnu99 together will cause > > > build time errors espcially with clang > > > > > > -error: invalid argument '-std=gnu99' not allowed with 'C++' > > > - > > > -gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) > > > - as well clang default to these standards mode or newer > > > -anyway > > > - > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > - > > > -1. Keep '-std=c++11' and '-std=gnu99' to fix native build error > > > +Keep '-std=c++11' to fix native build error > > > with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang > > > we will remove them through GRPC_PYTHON_CFLAGS at do_compile > > > in bb recipe. > > > > > > -2. While export CC="gcc ", cc_args is None, it will > > > +While export CC="gcc ", cc_args is None, it will > > > cause subprocess.Popen always return 1. On centos 8, if you don't > > > install package libatomic, there will be a native build error > > > `cannot find /usr/lib64/libatomic.so.1.2.0'. > > > @@ -28,47 +20,57 @@ install package libatomic, there will be a native build error > > > Add no harm '-g' to cc_args if cc_args is empty. > > > > > > Upstream-Status: Inappropriate [oe specific] > > > + > > > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > > > --- > > > - setup.py | 6 +++++- > > > + setup.py | 9 ++++++--- > > > src/python/grpcio/commands.py | 5 ++++- > > > - 2 files changed, 9 insertions(+), 2 deletions(-) > > > + 2 files changed, 10 insertions(+), 4 deletions(-) > > > > > > diff --git a/setup.py b/setup.py > > > -index e950057..1b68221 100644 > > > +index 4b8c9d4..271b7b1 100644 > > > --- a/setup.py > > > +++ b/setup.py > > > -@@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get( > > > - > > > - def check_linker_need_libatomic(): > > > - """Test if linker on system needs libatomic.""" > > > -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > > > -+ if not cc_args: > > > -+ cc_args = "-g" > > > +@@ -172,8 +172,11 @@ def check_linker_need_libatomic(): > > > + """Test if linker on system needs libatomic.""" > > > + code_test = (b'#include <atomic>\n' + > > > + b'int main() { return std::atomic<int64_t>{}; }') > > > +- cxx = os.environ.get('CXX', 'c++') > > > +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], > > > ++ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' > > > ++ if not cxx_args: > > > ++ cxx_args = "-g" > > > + > > > - code_test = (b'#include <atomic>\n' + > > > - b'int main() { return std::atomic<int64_t>{}; }') > > > -- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], > > > -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'], > > > - stdin=PIPE, > > > - stdout=PIPE, > > > - stderr=PIPE) > > > ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], > > > + stdin=PIPE, > > > + stdout=PIPE, > > > + stderr=PIPE) > > > +@@ -183,7 +186,7 @@ def check_linker_need_libatomic(): > > > + # Double-check to see if -latomic actually can solve the problem. > > > + # https://github.com/grpc/grpc/issues/22491 > > > + cpp_test = subprocess.Popen( > > > +- [cxx, '-x', 'c++', '-std=c++11', '-latomic', '-'], > > > ++ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-latomic', '-'], > > > + stdin=PIPE, > > > + stdout=PIPE, > > > + stderr=PIPE) > > > diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py > > > -index 064dda9..a75d8b9 100644 > > > +index a8b2ff5..b928201 100644 > > > --- a/src/python/grpcio/commands.py > > > +++ b/src/python/grpcio/commands.py > > > -@@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext): > > > - when invoked in C mode. GCC is okay with this, while clang is not. > > > +@@ -219,7 +219,10 @@ class BuildExt(build_ext.build_ext): > > > """ > > > - # TODO(lidiz) Remove the generated a.out for success tests. > > > -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], > > > -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > > > -+ if not cc_args: > > > -+ cc_args = "-g" > > > -+ cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], > > > - stdin=subprocess.PIPE, > > > - stdout=subprocess.PIPE, > > > - stderr=subprocess.PIPE) > > > + try: > > > + # TODO(lidiz) Remove the generated a.out for success tests. > > > +- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], > > > ++ cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' > > > ++ if not cc_args: > > > ++ cc_args = "-g" > > > ++ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'], > > > + stdin=subprocess.PIPE, > > > + stdout=subprocess.PIPE, > > > + stderr=subprocess.PIPE) > > > -- > > > -2.7.4 > > > +2.30.1 > > > > > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > > > new file mode 100644 > > > index 0000000000..65db4a6ed4 > > > --- /dev/null > > > +++ b/meta-python/recipes-devtools/python/python3-grpcio/boring_ssl.patch > > > @@ -0,0 +1,36 @@ > > > +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 <raj.khem@gmail.com> > > > +--- a/setup.py > > > ++++ b/setup.py > > > +@@ -109,6 +109,8 @@ CLASSIFIERS = [ > > > + BUILD_WITH_BORING_SSL_ASM = os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', > > > + True) > > > + > > > ++BORING_SSL_PLATFORM = os.environ.get('GRPC_BORING_SSL_PLATFORM', > > > ++ True) > > > + # Environment variable to determine whether or not the Cython extension should > > > + # *use* Cython or use the generated C files. Note that this requires the C files > > > + # to have been generated by building first *with* Cython support. Even if this > > > +@@ -306,15 +308,15 @@ asm_key = '' > > > + if BUILD_WITH_BORING_SSL_ASM and not BUILD_WITH_SYSTEM_OPENSSL: > > > + LINUX_X86_64 = 'linux-x86_64' > > > + LINUX_ARM = 'linux-arm' > > > +- if LINUX_X86_64 == util.get_platform(): > > > ++ if LINUX_X86_64 == BORING_SSL_PLATFORM: > > > + asm_key = 'crypto_linux_x86_64' > > > +- elif LINUX_ARM == util.get_platform(): > > > ++ elif LINUX_ARM == BORING_SSL_PLATFORM: > > > + asm_key = 'crypto_linux_arm' > > > +- elif "mac" in util.get_platform() and "x86_64" in util.get_platform(): > > > ++ elif "mac" in BORING_SSL_PLATFORM and "x86_64" in BORING_SSL_PLATFORM: > > > + asm_key = 'crypto_mac_x86_64' > > > + else: > > > + print("ASM Builds for BoringSSL currently not supported on:", > > > +- util.get_platform()) > > > ++ BORING_SSL_PLATFORM) > > > + if asm_key: > > > + asm_files = grpc_core_dependencies.ASM_SOURCE_FILES[asm_key] > > > + else: > > > 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 8ac2aef8c4..dadd3da85e 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 > > > @@ -3,8 +3,8 @@ Let boringSSL compile on ppc32 bit > > > Upstream-Status: Pending > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > > > > ---- a/third_party/boringssl/include/openssl/base.h > > > -+++ b/third_party/boringssl/include/openssl/base.h > > > +--- 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 > > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > > > index 8c9ffa21b7..7e071ae1e6 100644 > > > --- a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > > > +++ b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch > > > @@ -2,8 +2,8 @@ Add RISC-V 64bit support > > > > > > Upstream-Status: Pending > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- a/third_party/boringssl/include/openssl/base.h > > > -+++ b/third_party/boringssl/include/openssl/base.h > > > +--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h > > > ++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h > > > @@ -108,6 +108,14 @@ extern "C" { > > > #elif defined(__mips__) && defined(__LP64__) > > > #define OPENSSL_64_BIT > > > diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > > > similarity index 55% > > > rename from meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb > > > rename to meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > > > index 129bb35bcc..2c137f6ce7 100644 > > > --- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb > > > +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.35.0.bb > > > @@ -9,10 +9,9 @@ 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://riscv64_support.patch \ > > > - file://0001-Fix-build-on-riscv32.patch \ > > > + file://boring_ssl.patch \ > > > " > > > -SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" > > > -SRC_URI[sha256sum] = "a899725d34769a498ecd3be154021c4368dd22bdc69473f6ec46779696f626c4" > > > +SRC_URI[sha256sum] = "7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c" > > > > > > RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ > > > ${PYTHON_PN}-setuptools \ > > > @@ -24,9 +23,18 @@ inherit pypi > > > > > > export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" > > > > > > -do_compile_prepend_toolchain-clang() { > > > - export GRPC_PYTHON_CFLAGS='-fvisibility=hidden -fno-wrapv -fno-exceptions' > > > -} > > > +BORING_SSL_PLATFORM_arm = "linux-arm" > > > +BORING_SSL_PLATFORM_x86-64 = "linux-x86_64" > > > +BORING_SSL_PLATFORM ?= "unsupported" > > > +export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" > > > + > > > +BORING_SSL_x86-64 = "1" > > > +BORING_SSL_arm = "1" > > > +BORING_SSL ?= "0" > > > +export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" > > > + > > > +GRPC_CFLAGS_append_toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" > > > +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" > > > > > > CLEANBROKEN = "1" > > > > > > -- > > > 2.30.1 > > > > > > > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-24 9:56 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-02-18 19:32 [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 Khem Raj 2021-02-18 19:32 ` [PATCH v3] recipes: Update common-licenses references to match new names Khem Raj 2021-02-23 10:58 ` [oe] [meta-python][PATCH v2] python3-grpcio: Upgrade to 1.35.0 Clément Péron 2021-02-23 15:56 ` Khem Raj 2021-02-24 9:56 ` Clément Péron
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.