From: Eli Schwartz <eschwartz93@gmail.com>
Date: Thu, 16 Feb 2023 17:57:59 +0000 (-0500)
Subject: gh-99942: correct the pkg-config/python-config flags for cygwin/android
X-Git-Tag: v3.12.0a6~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=226484e47599a93f5bf033ac47198e68ff401432;p=thirdparty%2FPython%2Fcpython.git

gh-99942: correct the pkg-config/python-config flags for cygwin/android
---

diff --git a/Misc/NEWS.d/next/Build/2023-01-12-00-49-16.gh-issue-99942.DUR8b4.rst b/Misc/NEWS.d/next/Build/2023-01-12-00-49-16.gh-issue-99942.DUR8b4.rst
new file mode 100644
index 000000000000..5b692c3cc458
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2023-01-12-00-49-16.gh-issue-99942.DUR8b4.rst
@@ -0,0 +1,2 @@
+On Android, in a static build, python-config in embed mode no longer
+incorrectly reports a library to link to.
diff --git a/configure b/configure
index 7c4254f3cb17..17dc62fb63de 100755
--- a/configure
+++ b/configure
@@ -21496,7 +21496,7 @@ $as_echo "$LDVERSION" >&6; }
 
 # On Android and Cygwin the shared libraries must be linked with libpython.
 
-if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
+if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then
   LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
 else
   LIBPYTHON=''
diff --git a/configure.ac b/configure.ac
index 370bbe07c576..bc288b86cfa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5759,7 +5759,7 @@ AC_MSG_RESULT($LDVERSION)
 
 # On Android and Cygwin the shared libraries must be linked with libpython.
 AC_SUBST(LIBPYTHON)
-if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
+if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then
   LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
 else
   LIBPYTHON=''