| Message ID | 1423430604-5896-1-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 414d7e97a7359be87ef3b622c409e4200a8991ff |
| Headers | show |
Hi Thomas, Le 08/02/2015 22:23, Thomas Petazzoni a écrit : > This commit adds a patch to python3 that makes sure it does not use an > invalid header path (pointing to host headers) when including ncursesw > support. > > Fixes: > > http://autobuild.buildroot.org/results/9bd/9bdaa392e8dd00c6ebee156b758e3c0cac480237/ > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- I reproduced the build issue which is indeed fixed by your patch. Just build tested though. Reviewed-by: Romain Naour <romain.naour@openwide.fr> Tested-by: Romain Naour <romain.naour@openwide.fr> Best regards, Romain > .../018-ncursesw-remove-wrong-includedir.patch | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > create mode 100644 package/python3/018-ncursesw-remove-wrong-includedir.patch > > diff --git a/package/python3/018-ncursesw-remove-wrong-includedir.patch b/package/python3/018-ncursesw-remove-wrong-includedir.patch > new file mode 100644 > index 0000000..ae87bbf > --- /dev/null > +++ b/package/python3/018-ncursesw-remove-wrong-includedir.patch > @@ -0,0 +1,21 @@ > +Do not harcode invalid path to ncursesw headers > + > +Adding /usr/include/ncursesw is obviously invalid when > +cross-compiling. Since the ncursesw headers are no longer installed in > +usr/include/ncursesw/, but directly in usr/include, there is anyway no > +need for a special header path. > + > +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > + > +Index: b/setup.py > +=================================================================== > +--- a/setup.py > ++++ b/setup.py > +@@ -1287,7 +1287,6 @@ > + 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' >
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > This commit adds a patch to python3 that makes sure it does not use an > invalid header path (pointing to host headers) when including ncursesw > support. > Fixes: > http://autobuild.buildroot.org/results/9bd/9bdaa392e8dd00c6ebee156b758e3c0cac480237/ > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks.
diff --git a/package/python3/018-ncursesw-remove-wrong-includedir.patch b/package/python3/018-ncursesw-remove-wrong-includedir.patch new file mode 100644 index 0000000..ae87bbf --- /dev/null +++ b/package/python3/018-ncursesw-remove-wrong-includedir.patch @@ -0,0 +1,21 @@ +Do not harcode invalid path to ncursesw headers + +Adding /usr/include/ncursesw is obviously invalid when +cross-compiling. Since the ncursesw headers are no longer installed in +usr/include/ncursesw/, but directly in usr/include, there is anyway no +need for a special header path. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1287,7 +1287,6 @@ + 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'
This commit adds a patch to python3 that makes sure it does not use an invalid header path (pointing to host headers) when including ncursesw support. Fixes: http://autobuild.buildroot.org/results/9bd/9bdaa392e8dd00c6ebee156b758e3c0cac480237/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- .../018-ncursesw-remove-wrong-includedir.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/python3/018-ncursesw-remove-wrong-includedir.patch