Skip to content
This repository was archived by the owner on Feb 24, 2023. It is now read-only.

Commit 3a5a22a

Browse files
committed
python: Drop an unnecessary patch for ncurses
That is necessary only if ncurses is built with prefix != /usr or --disable-overwrite is used. Neither is the case now, so adapting to header paths is not necessary. Also tweaks configure options for ncurses. Only necessary options are kept. Fixes build failures after python/cpython#4165 pybuild-rebuild=ncurses
1 parent 2f70d39 commit 3a5a22a

File tree

3 files changed

+2
-274
lines changed

3 files changed

+2
-274
lines changed

mk/python/ncurses-headers.patch

Lines changed: 0 additions & 266 deletions
This file was deleted.

pybuild/packages/ncurses.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,15 @@ class NCurses(Package):
99
def prepare(self):
1010
self.run_with_env([
1111
'./configure',
12+
'--prefix=/usr',
1213
f'--host={target_arch().ANDROID_TARGET}',
1314
'--without-ada',
14-
'--without-manpages',
15-
'--without-progs',
16-
'--without-tests',
17-
'--without-termlib',
18-
'--enable-termcap',
1915
'--enable-widec',
2016
'--without-shared',
2117
'--with-normal',
2218
'--without-debug',
2319
'--without-cxx-binding',
24-
'--without-curses-h',
25-
'--with-warnings',
20+
'--enable-warnings',
2621
])
2722

2823
def build(self):

pybuild/packages/python.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class Python(Package):
1010
patches = [
1111
# https://bugs.python.org/issue29440
1212
RemotePatch('https://bugs.python.org/file46517/gdbm.patch'),
13-
LocalPatch('ncurses-headers'),
1413
# https://bugs.python.org/issue29436
1514
LocalPatch('nl_langinfo'),
1615
LocalPatch('cppflags'),

0 commit comments

Comments
 (0)