mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
705b0036c8
WARNING: python-grpcio-1.8.4-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
patching file setup.py
Hunk #1 succeeded at 115 with fuzz 2 (offset -1 lines).
Now at patch 0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
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 <raj.khem@gmail.com>
|
|
---
|
|
setup.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: grpcio-1.8.4/setup.py
|
|
===================================================================
|
|
--- grpcio-1.8.4.orig/setup.py
|
|
+++ grpcio-1.8.4/setup.py
|
|
@@ -115,7 +115,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
|
|
else:
|
|
EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64'
|
|
elif "linux" in sys.platform:
|
|
- EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
|
|
+ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
|
|
elif "darwin" in sys.platform:
|
|
EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
|
|
|