traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-21536: Fix configure.ac for LIBPYTHON on Android/Cygwin (GH-13552) 

Add also missing AC_MSG_RESULT for AC_MSG_CHECKING(MACHDEP).
This commit is contained in:
E. M. Bray 2019-05-24 18:39:39 +02:00 committed by Victor Stinner
parent bc66faccb8
commit b1fc417841
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -3292,6 +3292,8 @@ then
'') MACHDEP="unknown";; '') MACHDEP="unknown";;
esac esac
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5
$as_echo "\"$MACHDEP\"" >&6; }
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
@ -15131,10 +15133,10 @@ $as_echo "$LDVERSION" >&6; }
# On Android and Cygwin the shared libraries must be linked with libpython. # On Android and Cygwin the shared libraries must be linked with libpython.
if test -z "$ANDROID_API_LEVEL" -o "$MACHDEP" != "cygwin"; then if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
LIBPYTHON=''
else
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
else
LIBPYTHON=''
fi fi

7
configure.ac
View File

@ -411,6 +411,7 @@ then
'') MACHDEP="unknown";; '') MACHDEP="unknown";;
esac esac
fi fi
AC_MSG_RESULT("$MACHDEP")
AC_SUBST(_PYTHON_HOST_PLATFORM) AC_SUBST(_PYTHON_HOST_PLATFORM)
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
@ -4622,10 +4623,10 @@ AC_MSG_RESULT($LDVERSION)
# On Android and Cygwin the shared libraries must be linked with libpython. # On Android and Cygwin the shared libraries must be linked with libpython.
AC_SUBST(LIBPYTHON) AC_SUBST(LIBPYTHON)
if test -z "$ANDROID_API_LEVEL" -o "$MACHDEP" != "cygwin"; then if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
LIBPYTHON=''
else
LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
else
LIBPYTHON=''
fi fi
dnl define LIBPL after ABIFLAGS and LDVERSION is defined. dnl define LIBPL after ABIFLAGS and LDVERSION is defined.