Skip to content

Commit fe3fc3d

Browse files
author
Pol Canelles
committed
Removes the include and link paths for python2
1 parent c3532d4 commit fe3fc3d

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

pythonforandroid/recipes/cryptography/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@ class CryptographyRecipe(CompiledComponentsPythonRecipe):
1111
def get_recipe_env(self, arch):
1212
env = super(CryptographyRecipe, self).get_recipe_env(arch)
1313
openssl_dir = self.get_recipe('openssl', self.ctx).get_build_dir(arch.arch)
14-
env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()
15-
env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python2.7' + \
16-
' -I' + join(openssl_dir, 'include')
1714
# Set linker to use the correct gcc
1815
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
19-
env['LDFLAGS'] += ' -L' + env['PYTHON_ROOT'] + '/lib' + \
20-
' -L' + openssl_dir + \
21-
' -lpython2.7' + \
16+
env['LDFLAGS'] += ' -L' + openssl_dir + \
2217
' -lssl -lcrypto'
2318
return env
2419

pythonforandroid/recipes/m2crypto/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ def build_arch(self, arch):
2929
def get_recipe_env(self, arch):
3030
env = super(M2CryptoRecipe, self).get_recipe_env(arch)
3131
env['OPENSSL_BUILD_PATH'] = self.get_recipe('openssl', self.ctx).get_build_dir(arch.arch)
32-
env['CFLAGS'] += ' -I' + join(self.ctx.get_python_install_dir(), 'include/python2.7')
3332
# Set linker to use the correct gcc
3433
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
35-
env['LDFLAGS'] += ' -lpython2.7'
3634
return env
3735

3836
recipe = M2CryptoRecipe()

pythonforandroid/recipes/pyleveldb/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@ def get_recipe_env(self, arch):
2424
env = super(PyLevelDBRecipe, self).get_recipe_env(arch)
2525
# Copy environment from leveldb recipe
2626
env.update(self.get_recipe('leveldb', self.ctx).get_recipe_env(arch))
27-
env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()
28-
env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python2.7'
2927
# Set linker to use the correct gcc
3028
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
31-
env['LDFLAGS'] += ' -lpython2.7' + \
32-
' -lleveldb'
29+
env['LDFLAGS'] += ' -lleveldb'
3330
return env
3431

3532
recipe = PyLevelDBRecipe()

0 commit comments

Comments
 (0)