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

bpo-36508: python-config don't export LINKFORSHARED (GH-12661) 

python-config --ldflags no longer includes flags of the LINKFORSHARED
variable. The LINKFORSHARED variable must only be used to build
executables.
This commit is contained in:
Victor Stinner 2019-04-09 18:12:44 +02:00 committed by GitHub
parent 2ee077f795
commit e65f01f78d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pre.in
View File

@ -104,6 +104,8 @@ PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
NO_AS_NEEDED= @NO_AS_NEEDED@ NO_AS_NEEDED= @NO_AS_NEEDED@
SGI_ABI= @SGI_ABI@ SGI_ABI= @SGI_ABI@
CCSHARED= @CCSHARED@ CCSHARED= @CCSHARED@
# LINKFORSHARED are the flags passed to the $(CC) command that links
# the python executable -- this is only needed for a few systems
LINKFORSHARED= @LINKFORSHARED@ LINKFORSHARED= @LINKFORSHARED@
ARFLAGS= @ARFLAGS@ ARFLAGS= @ARFLAGS@
# Extra C flags added for building the interpreter object files. # Extra C flags added for building the interpreter object files.

3
Misc/NEWS.d/next/Build/2019-04-02-17-01-23.bpo-36508.SN5Y6N.rst Normal file
View File

@ -0,0 +1,3 @@
``python-config --ldflags`` no longer includes flags of the
``LINKFORSHARED`` variable. The ``LINKFORSHARED`` variable must only be used
to build executables.

2
Misc/python-config.in
View File

@ -55,8 +55,6 @@ for opt in opt_flags:
if opt == '--ldflags': if opt == '--ldflags':
if not getvar('Py_ENABLE_SHARED'): if not getvar('Py_ENABLE_SHARED'):
libs.insert(0, '-L' + getvar('LIBPL')) libs.insert(0, '-L' + getvar('LIBPL'))
if not getvar('PYTHONFRAMEWORK'):
libs.extend(getvar('LINKFORSHARED').split())
print(' '.join(libs)) print(' '.join(libs))
elif opt == '--extension-suffix': elif opt == '--extension-suffix':

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

@ -44,7 +44,6 @@ ABIFLAGS="@ABIFLAGS@"
LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
BASECFLAGS="@BASECFLAGS@" BASECFLAGS="@BASECFLAGS@"
LDLIBRARY="@LDLIBRARY@" LDLIBRARY="@LDLIBRARY@"
LINKFORSHARED="@LINKFORSHARED@"
OPT="@OPT@" OPT="@OPT@"
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
LDVERSION="@LDVERSION@" LDVERSION="@LDVERSION@"
@ -89,15 +88,11 @@ do
echo "$LIBS" echo "$LIBS"
;; ;;
--ldflags) --ldflags)
LINKFORSHAREDUSED=
if [ -z "$PYTHONFRAMEWORK" ] ; then
LINKFORSHAREDUSED=$LINKFORSHARED
fi
LIBPLUSED= LIBPLUSED=
if [ "$PY_ENABLE_SHARED" = "0" ] ; then if [ "$PY_ENABLE_SHARED" = "0" ] ; then
LIBPLUSED="-L$LIBPL" LIBPLUSED="-L$LIBPL"
fi fi
echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" echo "$LIBPLUSED -L$libdir $LIBS"
;; ;;
--extension-suffix) --extension-suffix)
echo "$SO" echo "$SO"