Skip to content

Commit ba9cdf9

Browse files
committed
eventlet recipe fixed
1 parent 2c0ada1 commit ba9cdf9

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/setup.py b/setup.py
2+
index 7a601d5..56491a0 100644
3+
--- a/setup.py
4+
+++ b/setup.py
5+
@@ -1,8 +1,17 @@
6+
#!/usr/bin/env python
7+
-from setuptools import find_packages, setup
8+
+from distutils.core import setup
9+
from eventlet import __version__
10+
from os import path
11+
12+
+import re, os
13+
+def find_packages(path='.', exclude=[]):
14+
+ ret = []
15+
+ for root, dirs, files in os.walk(path):
16+
+ if '__init__.py' in files:
17+
+ ret.append(re.sub('^[^A-z0-9_]+', '', root.replace('/', '.')))
18+
+ ret = [i for i in ret if i not in exclude]
19+
+ return ret
20+
+
21+
22+
setup(
23+
name='eventlet',
24+

recipes/eventlet/recipe.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,18 @@ BUILD_eventlet=$BUILD_PATH/eventlet/$(get_directory $URL_eventlet)
88
RECIPE_eventlet=$RECIPES_PATH/eventlet
99

1010
function prebuild_eventlet() {
11-
# TODO: patch setup.py to use distutils instead of setuptools
12-
true
11+
cd $BUILD_eventlet
12+
13+
# check marker in our source build
14+
if [ -f .patched ]; then
15+
# no patch needed
16+
return
17+
fi
18+
19+
try patch -p1 < $RECIPE_eventlet/patches/fix-setuptools.patch
20+
21+
# everything done, touch the marker !
22+
touch .patched
1323
}
1424

1525
function shouldbuild_eventlet() {

0 commit comments

Comments
 (0)