Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d486c43d
Commit
d486c43d
authored
Oct 02, 2014
by
doko@ubuntu.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Issue #18096: Fix library order returned by python-config.
parent
1de0ba2c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
Misc/NEWS
Misc/NEWS
+2
-0
Misc/python-config.in
Misc/python-config.in
+3
-2
Misc/python-config.sh.in
Misc/python-config.sh.in
+1
-1
No files found.
Misc/NEWS
View file @
d486c43d
...
...
@@ -38,6 +38,8 @@ Build
-
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?
===========================
...
...
Misc/python-config.in
View file @
d486c43d
...
...
@@ -47,8 +47,9 @@ for opt in opt_flags:
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'
:
...
...
Misc/python-config.sh.in
View file @
d486c43d
...
...
@@ -40,7 +40,7 @@ LIBM="@LIBM@"
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@"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment