(original) (raw)

changeset: 92731:8db7fcf6c67d parent: 92728:301b9a58021c parent: 92730:b826ba76d1ce user: doko@ubuntu.com date: Thu Oct 02 02:02:45 2014 +0200 files: Misc/NEWS description: - Issue #18096: Fix library order returned by python-config. diff -r 301b9a58021c -r 8db7fcf6c67d Misc/NEWS --- a/Misc/NEWS Thu Oct 02 00:11:21 2014 +0300 +++ b/Misc/NEWS Thu Oct 02 02:02:45 2014 +0200 @@ -1058,6 +1058,8 @@ - Issue #21166: Prevent possible segfaults and other random failures of python --generate-posix-vars in pybuilddir.txt build target. +- Issue #18096: Fix library order returned by python-config. + C API ----- diff -r 301b9a58021c -r 8db7fcf6c67d Misc/python-config.in --- a/Misc/python-config.in Thu Oct 02 00:11:21 2014 +0300 +++ b/Misc/python-config.in Thu Oct 02 02:02:45 2014 +0200 @@ -47,8 +47,9 @@ print(' '.join(flags)) elif opt in ('--libs', '--ldflags'): - libs = getvar('LIBS').split() + getvar('SYSLIBS').split() - libs.append('-lpython' + pyver + sys.abiflags) + libs = ['-lpython' + pyver + sys.abiflags] + libs += getvar('LIBS').split() + libs += getvar('SYSLIBS').split() # add the prefix/lib/pythonX.Y/config dir, but only if there is no # shared library in prefix/lib/. if opt == '--ldflags': diff -r 301b9a58021c -r 8db7fcf6c67d Misc/python-config.sh.in --- a/Misc/python-config.sh.in Thu Oct 02 00:11:21 2014 +0300 +++ b/Misc/python-config.sh.in Thu Oct 02 02:02:45 2014 +0200 @@ -40,7 +40,7 @@ LIBC="@LIBC@" SYSLIBS="$LIBM LIBC"ABIFLAGS="@ABIFLAGS@"−LIBS="@LIBS@LIBC" ABIFLAGS="@ABIFLAGS@" -LIBS="@LIBS@ LIBC"ABIFLAGS="@ABIFLAGS@"−LIBS="@LIBS@SYSLIBS -lpython${VERSION}${ABIFLAGS}" +LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" BASECFLAGS="@BASECFLAGS@" LDLIBRARY="@LDLIBRARY@" LINKFORSHARED="@LINKFORSHARED@"