From 705b0036c83050bc57fb4bfefa594f266b33cf05 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 7 Apr 2018 23:30:57 -0700 Subject: python-grpcio: refresh patches 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 devtool finish --force-patch-refresh 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 --- ...setup.py-Do-not-mix-C-and-C-compiler-options.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) 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 index 3abbc6d6f1..0c1d964a61 100644 --- 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 @@ -18,19 +18,16 @@ 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' +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' + EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' --- -2.13.4 - -- cgit 1.2.3-korg