[Python-checkins] cpython (3.4): - Issue #18096: Fix library order returned by python-config.
matthias.klose
python-checkins at python.org
Thu Oct 2 02:03:03 CEST 2014
https://hg.python.org/cpython/rev/b826ba76d1ce
changeset: 92730:b826ba76d1ce
branch: 3.4
parent: 92727:3bff73df6dab
user: doko at ubuntu.com
date: Thu Oct 02 02:00:14 2014 +0200
summary:
- Issue #18096: Fix library order returned by python-config.
files:
Misc/NEWS | 2 ++
Misc/python-config.in | 5 +++--
Misc/python-config.sh.in | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,8 @@
- Issue #16537: Check whether self.extensions is empty in setup.py. Patch by
Jonathan Hosmer.
+- Issue #18096: Fix library order returned by python-config.
+
What's New in Python 3.4.2?
===========================
diff --git a/Misc/python-config.in b/Misc/python-config.in
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -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 --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
@@ -40,7 +40,7 @@
LIBC="@LIBC@"
SYSLIBS="$LIBM $LIBC"
ABIFLAGS="@ABIFLAGS@"
-LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}${ABIFLAGS}"
+LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS"
BASECFLAGS="@BASECFLAGS@"
LDLIBRARY="@LDLIBRARY@"
LINKFORSHARED="@LINKFORSHARED@"
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list