From 2d07918e9cc6e03f8f864605c84290b66b81e998 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Aug 2017 14:47:58 -0700 Subject: python-grpcio: Do not hardcode compiler -std options Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 36 ++++++++++++++++++++++ .../recipes-devtools/python/python-grpcio_1.4.0.bb | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch diff --git a/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch new file mode 100644 index 0000000000..3686144b38 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -0,0 +1,36 @@ +From 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 + +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 +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index cb85273..f79878d 100644 +--- a/setup.py ++++ b/setup.py +@@ -116,7 +116,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: + elif 'win32' in sys.platform: + EXTRA_ENV_COMPILE_ARGS += ' -D_PYTHON_MSVC' + elif "linux" in sys.platform: +- EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -std=gnu99 -fvisibility=hidden -fno-wrapv' ++ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv' + elif "darwin" in sys.platform: + EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv' + +-- +2.13.4 + diff --git a/meta-python/recipes-devtools/python/python-grpcio_1.4.0.bb b/meta-python/recipes-devtools/python/python-grpcio_1.4.0.bb index 5412e02433..2446411a1a 100644 --- a/meta-python/recipes-devtools/python/python-grpcio_1.4.0.bb +++ b/meta-python/recipes-devtools/python/python-grpcio_1.4.0.bb @@ -4,6 +4,8 @@ SECTION = "devel/python" DEPENDS = "python-protobuf" +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ + " RDEPENDS_${PN} = "python-enum34 \ python-futures \ python-protobuf \ -- cgit 1.2.3-korg