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
e13c3201
Commit
e13c3201
authored
Dec 13, 2016
by
Xavier de Gaye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #28190: Cross compiling the _curses module does not use anymore
/usr/include/ncursesw as a headers search path.
parent
3a4e9893
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
configure
configure
+3
-1
configure.ac
configure.ac
+3
-1
setup.py
setup.py
+2
-1
No files found.
configure
View file @
e13c3201
...
@@ -15690,7 +15690,9 @@ fi
...
@@ -15690,7 +15690,9 @@ fi
# first curses header check
# first curses header check
ac_save_cppflags
=
"
$CPPFLAGS
"
ac_save_cppflags
=
"
$CPPFLAGS
"
CPPFLAGS
=
"
$CPPFLAGS
-I/usr/include/ncursesw"
if
test
"
$cross_compiling
"
=
no
;
then
CPPFLAGS
=
"
$CPPFLAGS
-I/usr/include/ncursesw"
fi
for
ac_header
in
curses.h ncurses.h
for
ac_header
in
curses.h ncurses.h
do
:
do
:
...
...
configure.ac
View file @
e13c3201
...
@@ -4885,7 +4885,9 @@ fi
...
@@ -4885,7 +4885,9 @@ fi
# first curses header check
# first curses header check
ac_save_cppflags="$CPPFLAGS"
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
if test "$cross_compiling" = no; then
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
fi
AC_CHECK_HEADERS(curses.h ncurses.h)
AC_CHECK_HEADERS(curses.h ncurses.h)
...
...
setup.py
View file @
e13c3201
...
@@ -1349,7 +1349,8 @@ class PyBuildExt(build_ext):
...
@@ -1349,7 +1349,8 @@ class PyBuildExt(build_ext):
panel_library
=
'panel'
panel_library
=
'panel'
if
curses_library
==
'ncursesw'
:
if
curses_library
==
'ncursesw'
:
curses_defines
.
append
((
'HAVE_NCURSESW'
,
'1'
))
curses_defines
.
append
((
'HAVE_NCURSESW'
,
'1'
))
curses_includes
.
append
(
'/usr/include/ncursesw'
)
if
not
cross_compiling
:
curses_includes
.
append
(
'/usr/include/ncursesw'
)
# Bug 1464056: If _curses.so links with ncursesw,
# Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw.
# _curses_panel.so must link with panelw.
panel_library
=
'panelw'
panel_library
=
'panelw'
...
...
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