mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

python3-grpcio: fix do_compile error for native

Browse Source 
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 <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Qi.Chen@windriver.com
2020-02-20 18:49:10 +08:00
committed by Khem Raj
parent 0daeae19f6
commit 7d242bcfc7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
+3 -3
View File
@@ -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 <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 4 Aug 2017 09:04:07 -0700 Date: Fri, 4 Aug 2017 09:04:07 -0700
Subject: [PATCH] setup.py: Do not mix C and C++ compiler options Subject: [PATCH] setup.py: Do not mix C and C++ compiler options
@@ -24,7 +24,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
def check_linker_need_libatomic(): def check_linker_need_libatomic():
"""Test if linker on system needs 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 <atomic>\n' + code_test = (b'#include <atomic>\n' +
b'int main() { return std::atomic<int64_t>{}; }') b'int main() { return std::atomic<int64_t>{}; }')
- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], - cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
@@ -57,7 +57,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
""" """
# TODO(lidiz) Remove the generated a.out for success tests. # TODO(lidiz) Remove the generated a.out for success tests.
- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], - 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', '-'], + cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
meta-python/recipes-devtools/python/python3-grpcio_1.27.1.bb
+2 -2
View File
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
DEPENDS += "${PYTHON_PN}-protobuf" DEPENDS += "${PYTHON_PN}-protobuf"
SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch"
file://ppc-boringssl-support.patch \ SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \
file://riscv64_support.patch \ file://riscv64_support.patch \
" "
SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98" SRC_URI[md5sum] = "ccaf4e7eb4f031d926fb80035d193b98"