Skip to content

Commit a11ed08

Browse files
titotito
committed
add new patch emulate linux from darwin system in python ./configure
1 parent 7ac9606 commit a11ed08

File tree

3 files changed

+49
-4
lines changed

3 files changed

+49
-4
lines changed

‎recipes/hostpython/recipe.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ function build_hostpython() {
2424

2525
try ./configure
2626
try make -j5
27-
bash
2827
try mv python.exe hostpython
2928
try mv Parser/pgen hostpgen
3029
#try mkdir -p ../prebuilt/Python-$PYVERSION/lib

‎recipes/python/patches/fix-configure-darwin.patch‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
--- Python-2.7.2.orig/configure 2012-07-09 23:48:02.000000000 +0200
2+
+++ Python-2.7.2/configure 2012-07-09 23:47:34.000000000 +0200
3+
@@ -4927,7 +4927,7 @@
4+
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
5+
INSTSONAME="$LDLIBRARY".$SOVERSION
6+
;;
7+
- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
8+
+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Darwin*)
9+
LDLIBRARY='libpython$(VERSION).so'
10+
BLDLIBRARY='-L. -lpython$(VERSION)'
11+
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
12+
@@ -4960,7 +4960,7 @@
13+
BLDLIBRARY='-L. -lpython$(VERSION)'
14+
RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
15+
;;
16+
- Darwin*)
17+
+ DDarwin*)
18+
LDLIBRARY='libpython$(VERSION).dylib'
19+
BLDLIBRARY='-L. -lpython$(VERSION)'
20+
RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
21+
@@ -7625,6 +7625,9 @@
22+
LDSHARED='ld -b'
23+
fi ;;
24+
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
25+
+ Darwin*|Linux*|GNU*|QNX*)
26+
+ LDSHARED='$(CC) -shared'
27+
+ LDCXXSHARED='$(CXX) -shared';;
28+
Darwin/1.3*)
29+
LDSHARED='$(CC) -bundle'
30+
LDCXXSHARED='$(CXX) -bundle'
31+
@@ -7680,9 +7683,6 @@
32+
fi
33+
fi
34+
;;
35+
- Linux*|GNU*|QNX*)
36+
- LDSHARED='$(CC) -shared'
37+
- LDCXXSHARED='$(CXX) -shared';;
38+
BSD/OS*/4*)
39+
LDSHARED="gcc -shared"
40+
LDCXXSHARED="g++ -shared";;

‎recipes/python/recipe.sh‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ function prebuild_python() {
3030
try patch -p1 < $RECIPE_python/patches/fix-remove-corefoundation.patch
3131
try patch -p1 < $RECIPE_python/patches/fix-dynamic-lookup.patch
3232

33+
system=$(uname -s)
34+
if [ "X$system" == "XDarwin" ]; then
35+
try patch -p1 < $RECIPE_python/patches/fix-configure-darwin.patch
36+
fi
37+
3338
# everything done, touch the marker !
3439
touch .patched
3540
}
@@ -58,8 +63,8 @@ function build_python() {
5863
fi
5964

6065
try ./configure --host=arm-eabi --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
66+
echo ./configure --host=arm-eabi --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
6167
echo $MAKE HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
62-
bash
6368
cp HOSTPYTHON=$BUILD_python/hostpython python
6469

6570
# FIXME, the first time, we got a error at:
@@ -71,10 +76,11 @@ function build_python() {
7176
debug 'First install (failing..)'
7277
$MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
7378
debug 'Second install.'
74-
try $MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
79+
touch python.exe python
80+
$MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
7581
pop_arm
7682

77-
try cp $BUILD_python/hostpython $BUILD_PATH/python-install/bin/python.host
83+
try cp $BUILD_hostpython/hostpython $BUILD_PATH/python-install/bin/python.host
7884
try cp libpython2.7.so $LIBS_PATH/
7985
}
8086

0 commit comments

Comments
 (0)