@@ -187,3 +187,99 @@ diff -ru Python-3.3.5/Python/pytime.c Python-3.3.5-android/Python/pytime.c
187187 /*
188188 * _PyTime_gettimeofday falls back to ftime when getttimeofday fails because the latter
189189 * might fail on some platforms. This fallback is unwanted on MacOSX because
190+ diff -ru Python-3.4.2/configure Python-3.4.2-android/configure
191+ --- Python-3.4.2/configure 2015-02-24 23:18:31.000000000 +0100
192+ +++ Python-3.4.2-android/configure 2015-03-01 20:15:02.000000000 +0100
193+ @@ -5406,6 +5406,34 @@
194+ MULTIARCH=$($CC --print-multiarch 2>/dev/null)
195+
196+
197+ + # Test if we're running on Android.
198+ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if target is Android-based" >&5
199+ + $as_echo_n "checking if target is Android-based... " >&6; }
200+ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
201+ + /* end confdefs.h. */
202+ +
203+ + #if __ANDROID__
204+ + yes
205+ + #endif
206+ +
207+ + _ACEOF
208+ + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
209+ + $EGREP "yes" >/dev/null 2>&1; then :
210+ +
211+ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
212+ + $as_echo "yes" >&6; }
213+ + with_android=yes
214+ +
215+ + else
216+ +
217+ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
218+ + $as_echo "no" >&6; }
219+ + with_android=no
220+ +
221+ +
222+ + fi
223+ + rm -f conftest*
224+ +
225+
226+
227+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRARY" >&5
228+ @@ -5650,7 +5678,14 @@
229+ SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
230+ ;;
231+ esac
232+ - INSTSONAME="$LDLIBRARY".$SOVERSION
233+ +
234+ + if test "$with_android" != yes
235+ + then
236+ + INSTSONAME="$LDLIBRARY".$SOVERSION
237+ + else
238+ + INSTSONAME="$LDLIBRARY"
239+ + fi
240+ +
241+ if test "$with_pydebug" != yes
242+ then
243+ PY3LIBRARY=libpython3.so
244+ diff -ru Python-3.4.2/configure.ac Python-3.4.2-android/configure.ac
245+ --- Python-3.4.2/configure.ac 2015-02-24 23:18:31.000000000 +0100
246+ +++ Python-3.4.2-android/configure.ac 2015-03-01 20:14:54.000000000 +0100
247+ @@ -796,6 +796,21 @@
248+ MULTIARCH=$($CC --print-multiarch 2>/dev/null)
249+ AC_SUBST(MULTIARCH)
250+
251+ + # Test if we're running on Android.
252+ + AC_MSG_CHECKING(if target is Android-based)
253+ + AC_EGREP_CPP(yes,
254+ + [
255+ + #if __ANDROID__
256+ + yes
257+ + #endif
258+ + ], [
259+ + AC_MSG_RESULT(yes)
260+ + with_android=yes
261+ + ], [
262+ + AC_MSG_RESULT(no)
263+ + with_android=no
264+ + ]
265+ + )
266+
267+ AC_SUBST(LIBRARY)
268+ AC_MSG_CHECKING(LIBRARY)
269+ @@ -970,7 +985,14 @@
270+ SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
271+ ;;
272+ esac
273+ - INSTSONAME="$LDLIBRARY".$SOVERSION
274+ +
275+ + if test "$with_android" != yes
276+ + then
277+ + INSTSONAME="$LDLIBRARY".$SOVERSION
278+ + else
279+ + INSTSONAME="$LDLIBRARY"
280+ + fi
281+ +
282+ if test "$with_pydebug" != yes
283+ then
284+ PY3LIBRARY=libpython3.so
285+
0 commit comments