mirror of https://github.com/python/cpython
[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:
parent
46f973f631
commit
42005c77a0
|
@ -43,7 +43,7 @@ SOABI= @SOABI@
|
|||
ABIFLAGS= @ABIFLAGS@
|
||||
ABI_THREAD= @ABI_THREAD@
|
||||
LDVERSION= @LDVERSION@
|
||||
MODULE_LDFLAGS=@MODULE_LDFLAGS@
|
||||
LIBPYTHON=@LIBPYTHON@
|
||||
GITVERSION= @GITVERSION@
|
||||
GITTAG= @GITTAG@
|
||||
GITBRANCH= @GITBRANCH@
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Rename build variable ``MODULE_LDFLAGS`` back to ``LIBPYTHON``, as it's used by
|
||||
package build systems (e.g. Meson).
|
|
@ -47,7 +47,7 @@ LIBM="@LIBM@"
|
|||
LIBC="@LIBC@"
|
||||
SYSLIBS="$LIBM $LIBC"
|
||||
ABIFLAGS="@ABIFLAGS@"
|
||||
LIBS="@MODULE_LDFLAGS@ @LIBS@ $SYSLIBS"
|
||||
LIBS="@LIBPYTHON@ @LIBS@ $SYSLIBS"
|
||||
LIBS_EMBED="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
|
||||
BASECFLAGS="@BASECFLAGS@"
|
||||
LDLIBRARY="@LDLIBRARY@"
|
||||
|
|
|
@ -9,5 +9,5 @@ Description: Build a C extension for Python
|
|||
Requires:
|
||||
Version: @VERSION@
|
||||
Libs.private: @LIBS@
|
||||
Libs: -L${libdir} @MODULE_LDFLAGS@
|
||||
Libs: -L${libdir} @LIBPYTHON@
|
||||
Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@
|
||||
|
|
|
@ -274,7 +274,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
|
|||
;;
|
||||
esac
|
||||
rule="$file: $objs"
|
||||
rule="$rule; \$(BLDSHARED) $objs $libs \$(MODULE_LDFLAGS) -o $file"
|
||||
rule="$rule; \$(BLDSHARED) $objs $libs \$(LIBPYTHON) -o $file"
|
||||
echo "$rule" >>$rulesf
|
||||
done
|
||||
done
|
||||
|
|
|
@ -840,7 +840,7 @@ LIBPL
|
|||
PY_ENABLE_SHARED
|
||||
PLATLIBDIR
|
||||
BINLIBDEST
|
||||
MODULE_LDFLAGS
|
||||
LIBPYTHON
|
||||
MODULE_DEPS_SHARED
|
||||
EXT_SUFFIX
|
||||
ALT_SOABI
|
||||
|
@ -24578,16 +24578,19 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
|
|||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5
|
||||
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_LDFLAGS=''
|
||||
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
|
||||
MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(LDLIBRARY)"
|
||||
MODULE_LDFLAGS="\$(BLDLIBRARY)"
|
||||
LIBPYTHON="\$(BLDLIBRARY)"
|
||||
fi
|
||||
|
||||
# On iOS the shared libraries must be linked with the Python framework
|
||||
|
|
11
configure.ac
11
configure.ac
|
@ -6164,16 +6164,19 @@ AC_MSG_CHECKING([LDVERSION])
|
|||
LDVERSION='$(VERSION)$(ABIFLAGS)'
|
||||
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_LDFLAGS])
|
||||
AC_SUBST([LIBPYTHON])
|
||||
MODULE_DEPS_SHARED='$(MODULE_DEPS_STATIC) $(EXPORTSYMS)'
|
||||
MODULE_LDFLAGS=''
|
||||
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
|
||||
MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(LDLIBRARY)"
|
||||
MODULE_LDFLAGS="\$(BLDLIBRARY)"
|
||||
LIBPYTHON="\$(BLDLIBRARY)"
|
||||
fi
|
||||
|
||||
# On iOS the shared libraries must be linked with the Python framework
|
||||
|
|
Loading…
Reference in New Issue