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
a44cc3cc
Commit
a44cc3cc
authored
Sep 18, 2016
by
Christian Heimes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26661: setup.py now detects system libffi with multiarch wrapper.
parent
ec34a4da
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
Misc/NEWS
Misc/NEWS
+2
-0
setup.py
setup.py
+9
-7
No files found.
Misc/NEWS
View file @
a44cc3cc
...
...
@@ -364,6 +364,8 @@ Windows
Build
-----
-
Issue
#
26661
:
setup
.
py
now
detects
system
libffi
with
multiarch
wrapper
.
-
Issue
#
28066
:
Fix
the
logic
that
searches
build
directories
for
generated
include
files
when
building
outside
the
source
tree
.
...
...
setup.py
View file @
a44cc3cc
...
...
@@ -1997,14 +1997,16 @@ class PyBuildExt(build_ext):
ffi_inc
=
find_file
(
'ffi.h'
,
[],
inc_dirs
)
if
ffi_inc
is
not
None
:
ffi_h
=
ffi_inc
[
0
]
+
'/ffi.h'
with
open
(
ffi_h
)
as
fp
:
while
1
:
line
=
fp
.
readline
()
if
not
line
:
ffi_inc
=
None
break
if
line
.
startswith
(
'#define LIBFFI_H'
):
with
open
(
ffi_h
)
as
f
:
for
line
in
f
:
line
=
line
.
strip
()
if
line
.
startswith
((
'#define LIBFFI_H'
,
'#define ffi_wrapper_h'
)):
break
else
:
ffi_inc
=
None
print
(
'Header file {} does not define LIBFFI_H or '
'ffi_wrapper_h'
.
format
(
ffi_h
))
ffi_lib
=
None
if
ffi_inc
is
not
None
:
for
lib_name
in
(
'ffi_convenience'
,
'ffi_pic'
,
'ffi'
):
...
...
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