From 7d242bcfc77f00ce9acec6541a4f5711d8d4a51b Mon Sep 17 00:00:00 2001 From: "Qi.Chen@windriver.com" Date: Thu, 20 Feb 2020 18:49:10 +0800 Subject: python3-grpcio: fix do_compile error for native When building python3-grpcio-native, we will meet do_compile error because of no 'cc'. In fact, 'cc' is not in our hosttools. So fix to use gcc and make the patch also apply to native. Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- .../0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch | 6 +++--- meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 131daace06..f39a82a33d 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,4 +1,4 @@ -From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 +1From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Aug 2017 09:04:07 -0700 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options @@ -24,7 +24,7 @@ Signed-off-by: Khem Raj def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" -+ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'cc' ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') - cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], @@ -57,7 +57,7 @@ Signed-off-by: Khem Raj """ # 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 'cc' ++ compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb index bc2b70cf87..42260cb27c 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS += "${PYTHON_PN}-protobuf" -SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ - file://ppc-boringssl-support.patch \ +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 \ " SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" -- cgit 1.2.3-korg