Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-116622: Rename build variable MODULE_LDFLAGS back to LIBPYTHON (GH-122764) (GH-122842) 

gh-116622: Rename build variable MODULE_LDFLAGS back to LIBPYTHON (GH-122764)

(LIBPYTHON was renamed MODULE_LDFLAGS in commit 7f5e3f04f.)
(cherry picked from commit 2f5c3b09e4)

Co-authored-by: Malcolm Smith <smith@chaquo.com>
This commit is contained in:
Miss Islington (bot) 2024-08-09 23:45:04 +02:00 committed by GitHub
parent 46f973f631
commit 42005c77a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pre.in
View File

@ -43,7 +43,7 @@ SOABI= @SOABI@
ABIFLAGS= @ABIFLAGS@ ABIFLAGS= @ABIFLAGS@
ABI_THREAD= @ABI_THREAD@ ABI_THREAD= @ABI_THREAD@
LDVERSION= @LDVERSION@ LDVERSION= @LDVERSION@
MODULE_LDFLAGS=@MODULE_LDFLAGS@ LIBPYTHON=@LIBPYTHON@
GITVERSION= @GITVERSION@ GITVERSION= @GITVERSION@
GITTAG= @GITTAG@ GITTAG= @GITTAG@
GITBRANCH= @GITBRANCH@ GITBRANCH= @GITBRANCH@

2
Misc/NEWS.d/next/Build/2024-08-07-00-20-18.gh-issue-116622.U9cxHM.rst Normal file
View File

@ -0,0 +1,2 @@
Rename build variable ``MODULE_LDFLAGS`` back to ``LIBPYTHON``, as it's used by
package build systems (e.g. Meson).

2
Misc/python-config.sh.in
View File

@ -47,7 +47,7 @@ LIBM="@LIBM@"
LIBC="@LIBC@" LIBC="@LIBC@"
SYSLIBS="$LIBM $LIBC" SYSLIBS="$LIBM $LIBC"
ABIFLAGS="@ABIFLAGS@" ABIFLAGS="@ABIFLAGS@"
LIBS="@MODULE_LDFLAGS@ @LIBS@ $SYSLIBS" LIBS="@LIBPYTHON@ @LIBS@ $SYSLIBS"
LIBS_EMBED="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" LIBS_EMBED="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
BASECFLAGS="@BASECFLAGS@" BASECFLAGS="@BASECFLAGS@"
LDLIBRARY="@LDLIBRARY@" LDLIBRARY="@LDLIBRARY@"

2
Misc/python.pc.in
View File

@ -9,5 +9,5 @@ Description: Build a C extension for Python
Requires: Requires:
Version: @VERSION@ Version: @VERSION@
Libs.private: @LIBS@ Libs.private: @LIBS@
Libs: -L${libdir} @MODULE_LDFLAGS@ Libs: -L${libdir} @LIBPYTHON@
Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@

2
Modules/makesetup
View File

@ -274,7 +274,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
;; ;;
esac esac
rule="$file: $objs" rule="$file: $objs"
rule="$rule; \$(BLDSHARED) $objs $libs \$(MODULE_LDFLAGS) -o $file" rule="$rule; \$(BLDSHARED) $objs $libs \$(LIBPYTHON) -o $file"
echo "$rule" >>$rulesf echo "$rule" >>$rulesf
done done
done done

11
configure generated vendored
View File

@ -840,7 +840,7 @@ LIBPL
PY_ENABLE_SHARED PY_ENABLE_SHARED
PLATLIBDIR PLATLIBDIR
BINLIBDEST BINLIBDEST
MODULE_LDFLAGS LIBPYTHON
MODULE_DEPS_SHARED MODULE_DEPS_SHARED
EXT_SUFFIX EXT_SUFFIX
ALT_SOABI ALT_SOABI
@ -24578,16 +24578,19 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5
printf "%s\n" "$LDVERSION" >&6; } printf "%s\n" "$LDVERSION" >&6; }
# Configure the flags and dependencies used when compiling shared modules # Configure the flags and dependencies used when compiling shared modules.
# Do not rename LIBPYTHON - it's accessed via sysconfig by package build
# systems (e.g. Meson) to decide whether to link extension modules against
# libpython.
MODULE_DEPS_SHARED='$(MODULE_DEPS_STATIC) $(EXPORTSYMS)' MODULE_DEPS_SHARED='$(MODULE_DEPS_STATIC) $(EXPORTSYMS)'
MODULE_LDFLAGS='' LIBPYTHON=''
# 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 "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then
MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(LDLIBRARY)" MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(LDLIBRARY)"
MODULE_LDFLAGS="\$(BLDLIBRARY)" LIBPYTHON="\$(BLDLIBRARY)"
fi fi
# On iOS the shared libraries must be linked with the Python framework # On iOS the shared libraries must be linked with the Python framework

11
configure.ac
View File

@ -6164,16 +6164,19 @@ AC_MSG_CHECKING([LDVERSION])
LDVERSION='$(VERSION)$(ABIFLAGS)' LDVERSION='$(VERSION)$(ABIFLAGS)'
AC_MSG_RESULT([$LDVERSION]) AC_MSG_RESULT([$LDVERSION])
# Configure the flags and dependencies used when compiling shared modules # Configure the flags and dependencies used when compiling shared modules.
# Do not rename LIBPYTHON - it's accessed via sysconfig by package build
# systems (e.g. Meson) to decide whether to link extension modules against
# libpython.
AC_SUBST([MODULE_DEPS_SHARED]) AC_SUBST([MODULE_DEPS_SHARED])
AC_SUBST([MODULE_LDFLAGS]) AC_SUBST([LIBPYTHON])
MODULE_DEPS_SHARED='$(MODULE_DEPS_STATIC) $(EXPORTSYMS)' MODULE_DEPS_SHARED='$(MODULE_DEPS_STATIC) $(EXPORTSYMS)'
MODULE_LDFLAGS='' LIBPYTHON=''
# 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 "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then if test "$PY_ENABLE_SHARED" = "1" && ( test -n "$ANDROID_API_LEVEL" || test "$MACHDEP" = "cygwin"); then
MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(LDLIBRARY)" MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(LDLIBRARY)"
MODULE_LDFLAGS="\$(BLDLIBRARY)" LIBPYTHON="\$(BLDLIBRARY)"
fi fi
# On iOS the shared libraries must be linked with the Python framework # On iOS the shared libraries must be linked with the Python framework