|
 |
fc1c8e |
From 05650624fe2524ecb1bdbbd4facc5d988275e542 Mon Sep 17 00:00:00 2001
|
|
|
fc1c8e |
From: Dan Callaghan <dcallagh@redhat.com>
|
|
|
fc1c8e |
Date: Wed, 7 Jun 2017 13:55:53 +1000
|
|
|
fc1c8e |
Subject: [PATCH] always obey GEVENT_NO_CFFI_BUILD
|
|
|
fc1c8e |
|
|
|
fc1c8e |
If libev is not embedded, we still want to set GEVENT_NO_CFFI_BUILD=1 to
|
|
|
fc1c8e |
prevent setup.py from trying to configure libev, regardless whether cffi
|
|
|
fc1c8e |
modules will actually be built or not.
|
|
|
fc1c8e |
---
|
|
|
fc1c8e |
setup.py | 11 ++++++-----
|
|
|
fc1c8e |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
fc1c8e |
|
|
|
fc1c8e |
diff --git a/setup.py b/setup.py
|
|
|
fc1c8e |
index 9c229ad..ea4dcaf 100755
|
|
|
fc1c8e |
--- a/setup.py
|
|
|
fc1c8e |
+++ b/setup.py
|
|
|
fc1c8e |
@@ -90,16 +90,17 @@
|
|
|
fc1c8e |
except ImportError:
|
|
|
fc1c8e |
pass
|
|
|
fc1c8e |
else:
|
|
|
fc1c8e |
- if IGNORE_CFFI and not PYPY:
|
|
|
fc1c8e |
- # Allow distributors to turn off CFFI builds
|
|
|
fc1c8e |
- # even if it's available, because CFFI always embeds
|
|
|
fc1c8e |
- # our copy of libev and they may not want that.
|
|
|
fc1c8e |
- del cffi_modules[:]
|
|
|
fc1c8e |
# Note that we don't add cffi to install_requires, it's
|
|
|
fc1c8e |
# optional. We tend to build and distribute wheels with the CFFI
|
|
|
fc1c8e |
# modules built and they can be imported if CFFI is installed.
|
|
|
fc1c8e |
# install_requires.append('cffi >= 1.3.0')
|
|
|
fc1c8e |
+ pass
|
|
|
fc1c8e |
|
|
|
fc1c8e |
+if IGNORE_CFFI and not PYPY:
|
|
|
fc1c8e |
+ # Allow distributors to turn off CFFI builds
|
|
|
fc1c8e |
+ # even if it's available, because CFFI always embeds
|
|
|
fc1c8e |
+ # our copy of libev and they may not want that.
|
|
|
fc1c8e |
+ del cffi_modules[:]
|
|
|
fc1c8e |
|
|
|
fc1c8e |
# If we are running info / help commands, or we're being imported by
|
|
|
fc1c8e |
# tools like pyroma, we don't need to build anything
|
|
|
fc1c8e |
--
|
|
|
fc1c8e |
2.9.4
|
|
|
fc1c8e |
|