lede-packages-rs

commit 18b47920336409ee21a4c46ac47acfb71c473755
parent 407c821e31119f0851fb343437ecb78da1808f22
Author: Steven Barth <steven@midlink.org>
Date:   Tue, 21 Apr 2015 21:31:31 +0200

Merge pull request #1157 from commodo/python3-ncurses

python3: force libncurses
Diffstat:
M
lang/python3/files/python3-package-ncurses.mk
 | 
2
+-
A
lang/python3/patches/011-do-not-prefer-ncursesw.patch
 | 
15
+++++++++++++++

2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/lang/python3/files/python3-package-ncurses.mk b/lang/python3/files/python3-package-ncurses.mk
@@ -8,7 +8,7 @@
 define Package/python3-ncurses
 $(call Package/python3/Default)
   TITLE:=Python $(PYTHON3_VERSION) ncurses module
-  DEPENDS:=+python3-light +libncursesw
+  DEPENDS:=+python3-light +libncurses
 endef
 
 $(eval $(call Py3BasePackage,python3-ncurses, \
diff --git a/lang/python3/patches/011-do-not-prefer-ncursesw.patch b/lang/python3/patches/011-do-not-prefer-ncursesw.patch
@@ -0,0 +1,15 @@
+diff --git a/setup.py b/setup.py
+index 2779658..b6d3d61 100644
+--- a/setup.py
++++ b/setup.py
+@@ -693,8 +693,8 @@ class PyBuildExt(build_ext):
+         # use the same library for the readline and curses modules.
+         if 'curses' in readline_termcap_library:
+             curses_library = readline_termcap_library
+-        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
+-            curses_library = 'ncursesw'
++        #elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
++        #    curses_library = 'ncursesw'
+         elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
+             curses_library = 'ncurses'
+         elif self.compiler.find_library_file(lib_dirs, 'curses'):