Skip to content

Commit 392087b

Browse files
titotito
committed
fix dlfcn as well, OpenSSL is referring to it for RTLD_GLOBAL in the first case (before dl, and before ctypes)
1 parent 82a2530 commit 392087b

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

‎recipes/python/patches/fix-dlfcn.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff -Naur Python-2.7.2.orig/Lib/plat-linux2/DLFCN.py Python-2.7.2/Lib/plat-linux2/DLFCN.py
2+
--- Python-2.7.2.orig/Lib/plat-linux2/DLFCN.py 2011-06-11 17:46:24.000000000 +0200
3+
+++ Python-2.7.2/Lib/plat-linux2/DLFCN.py 2013-07-29 16:34:45.318131844 +0200
4+
@@ -74,10 +74,17 @@
5+
# Included from gnu/stubs.h
6+
7+
# Included from bits/dlfcn.h
8+
+# PATCHED FOR ANDROID (the only supported symbols are):
9+
+# enum {
10+
+# RTLD_NOW = 0,
11+
+# RTLD_LAZY = 1,
12+
+# RTLD_LOCAL = 0,
13+
+# RTLD_GLOBAL = 2,
14+
+# };
15+
RTLD_LAZY = 0x00001
16+
-RTLD_NOW = 0x00002
17+
-RTLD_BINDING_MASK = 0x3
18+
-RTLD_NOLOAD = 0x00004
19+
-RTLD_GLOBAL = 0x00100
20+
+RTLD_NOW = 0x00000
21+
+RTLD_BINDING_MASK = 0x0
22+
+RTLD_NOLOAD = 0x00000
23+
+RTLD_GLOBAL = 0x00002
24+
RTLD_LOCAL = 0
25+
-RTLD_NODELETE = 0x01000
26+
+RTLD_NODELETE = 0x00000

‎recipes/python/recipe.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ function prebuild_python() {
3030
try patch -p1 < $RECIPE_python/patches/verbose-compilation.patch
3131
try patch -p1 < $RECIPE_python/patches/fix-remove-corefoundation.patch
3232
try patch -p1 < $RECIPE_python/patches/fix-dynamic-lookup.patch
33+
try patch -p1 < $RECIPE_python/patches/fix-dlfcn.patch
3334

3435
system=$(uname -s)
3536
if [ "X$system" == "XDarwin" ]; then

0 commit comments

Comments
 (0)