Kaydet (Commit) d486c43d authored tarafından doko@ubuntu.com's avatar doko@ubuntu.com

- Issue #18096: Fix library order returned by python-config.

üst 1de0ba2c
...@@ -38,6 +38,8 @@ Build ...@@ -38,6 +38,8 @@ Build
- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by - Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
Jonathan Hosmer. Jonathan Hosmer.
- Issue #18096: Fix library order returned by python-config.
What's New in Python 3.4.2? What's New in Python 3.4.2?
=========================== ===========================
......
...@@ -47,8 +47,9 @@ for opt in opt_flags: ...@@ -47,8 +47,9 @@ for opt in opt_flags:
print(' '.join(flags)) print(' '.join(flags))
elif opt in ('--libs', '--ldflags'): elif opt in ('--libs', '--ldflags'):
libs = getvar('LIBS').split() + getvar('SYSLIBS').split() libs = ['-lpython' + pyver + sys.abiflags]
libs.append('-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 # add the prefix/lib/pythonX.Y/config dir, but only if there is no
# shared library in prefix/lib/. # shared library in prefix/lib/.
if opt == '--ldflags': if opt == '--ldflags':
......
...@@ -40,7 +40,7 @@ LIBM="@LIBM@" ...@@ -40,7 +40,7 @@ LIBM="@LIBM@"
LIBC="@LIBC@" LIBC="@LIBC@"
SYSLIBS="$LIBM $LIBC" SYSLIBS="$LIBM $LIBC"
ABIFLAGS="@ABIFLAGS@" ABIFLAGS="@ABIFLAGS@"
LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}${ABIFLAGS}" LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
BASECFLAGS="@BASECFLAGS@" BASECFLAGS="@BASECFLAGS@"
LDLIBRARY="@LDLIBRARY@" LDLIBRARY="@LDLIBRARY@"
LINKFORSHARED="@LINKFORSHARED@" LINKFORSHARED="@LINKFORSHARED@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment