diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-02-13 18:40:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 18:40:06 +0200 |
| commit | cc5f005e4f413d0884d4a3b5d1a7d11ee7802c7d (patch) | |
| tree | 2afef636ddb0bf769a1f333406151195795cd262 /lang/python3 | |
| parent | 287dea393d2fa6d0bb63c0489750f11a817376d5 (diff) | |
| parent | 5d53a642db043e91039b6bf3a382d07e62126d84 (diff) | |
Merge pull request #3998 from commodo/fix-ncurses-build
python,python3: fix ncurses module build
Diffstat (limited to 'lang/python3')
| -rw-r--r-- | lang/python3/patches/011-fix-ncursesw-definition-colisions.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/lang/python3/patches/011-fix-ncursesw-definition-colisions.patch b/lang/python3/patches/011-fix-ncursesw-definition-colisions.patch new file mode 100644 index 000000000..0df72c745 --- /dev/null +++ b/lang/python3/patches/011-fix-ncursesw-definition-colisions.patch @@ -0,0 +1,24 @@ +diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c +index 3bf2ca7..c156964 100644 +--- a/Modules/_cursesmodule.c ++++ b/Modules/_cursesmodule.c +@@ -116,7 +116,6 @@ char *PyCursesVersion = "2.2"; + #defines many common symbols (such as "lines") which breaks the + curses module in other ways. So the code will just specify + explicit prototypes here. */ +-extern int setupterm(char *,int,int *); + #ifdef __sgi + #include <term.h> + #endif +diff --git a/setup.py b/setup.py +index af9a414..ee19ecd 100644 +--- a/setup.py ++++ b/setup.py +@@ -1349,7 +1349,6 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' |