[packages/python] Python 2.7.3 got released meanwhile - level up, package python-readline
- thanks again to Cybjit git-svn-id: svn://svn.openwrt.org/openwrt/packages@31152 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
36
lang/python/patches/130-readline-setup.patch
Normal file
36
lang/python/patches/130-readline-setup.patch
Normal file
@ -0,0 +1,36 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -573,32 +573,7 @@ class PyBuildExt(build_ext):
|
||||
# readline
|
||||
do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
|
||||
readline_termcap_library = ""
|
||||
- curses_library = ""
|
||||
- # Determine if readline is already linked against curses or tinfo.
|
||||
- if do_readline and find_executable('ldd'):
|
||||
- fp = os.popen("ldd %s" % do_readline)
|
||||
- ldd_output = fp.readlines()
|
||||
- ret = fp.close()
|
||||
- if ret is None or ret >> 8 == 0:
|
||||
- for ln in ldd_output:
|
||||
- if 'curses' in ln:
|
||||
- readline_termcap_library = re.sub(
|
||||
- r'.*lib(n?cursesw?)\.so.*', r'\1', ln
|
||||
- ).rstrip()
|
||||
- break
|
||||
- if 'tinfo' in ln: # termcap interface split out from ncurses
|
||||
- readline_termcap_library = 'tinfo'
|
||||
- break
|
||||
- # Issue 7384: If readline is already linked against curses,
|
||||
- # 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, 'ncurses'):
|
||||
- curses_library = 'ncurses'
|
||||
- elif self.compiler.find_library_file(lib_dirs, 'curses'):
|
||||
- curses_library = 'curses'
|
||||
+ curses_library = "ncurses"
|
||||
|
||||
if platform == 'darwin':
|
||||
os_release = int(os.uname()[2].split('.')[0])
|
11
lang/python/patches/140-verbose-sharedmods.patch
Normal file
11
lang/python/patches/140-verbose-sharedmods.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -410,7 +410,7 @@ platform: $(BUILDPYTHON)
|
||||
# Build the shared modules
|
||||
sharedmods: $(BUILDPYTHON)
|
||||
@case $$MAKEFLAGS in \
|
||||
- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
|
||||
+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
|
||||
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
|
||||
esac
|
||||
|
Reference in New Issue
Block a user