mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
Avoid to use "ncursesw" which causes segfault when the system has
devel/ncurses installed due to a shared library collision between a base ncurses from libreadline dependency and a local ncurses from libncursesw dependency. PR: 99496 Submitted by: rachid achellal <rachid@in.nl>, Xiao-Yong Jin <xj2106@columbia.edu>
This commit is contained in:
parent
c6d8971628
commit
773ced5faf
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=170379
2 changed files with 40 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
||||||
--- setup.py.orig Tue Aug 31 10:37:25 2004
|
--- setup.py.orig Sat Aug 12 12:46:21 2006
|
||||||
+++ setup.py Fri Sep 3 10:42:53 2004
|
+++ setup.py Sat Aug 12 12:47:00 2006
|
||||||
@@ -15,7 +15,7 @@
|
@@ -15,7 +15,7 @@
|
||||||
from distutils.command.install_lib import install_lib
|
from distutils.command.install_lib import install_lib
|
||||||
|
|
||||||
|
@ -9,3 +9,21 @@
|
||||||
|
|
||||||
def add_dir_to_list(dirlist, dir):
|
def add_dir_to_list(dirlist, dir):
|
||||||
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
||||||
|
@@ -425,7 +425,7 @@
|
||||||
|
if self.compiler.find_library_file(lib_dirs, 'readline'):
|
||||||
|
readline_libs = ['readline']
|
||||||
|
if self.compiler.find_library_file(lib_dirs,
|
||||||
|
- 'ncursesw'):
|
||||||
|
+ 'xxxncursesw'):
|
||||||
|
readline_libs.append('ncursesw')
|
||||||
|
elif self.compiler.find_library_file(lib_dirs,
|
||||||
|
'ncurses'):
|
||||||
|
@@ -681,7 +681,7 @@
|
||||||
|
|
||||||
|
# Curses support, requiring the System V version of curses, often
|
||||||
|
# provided by the ncurses library.
|
||||||
|
- if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
|
||||||
|
+ if (self.compiler.find_library_file(lib_dirs, 'xxxncursesw')):
|
||||||
|
curses_libs = ['ncursesw']
|
||||||
|
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
||||||
|
libraries = curses_libs) )
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- setup.py.orig Tue Aug 31 10:37:25 2004
|
--- setup.py.orig Sat Aug 12 12:46:21 2006
|
||||||
+++ setup.py Fri Sep 3 10:42:53 2004
|
+++ setup.py Sat Aug 12 12:47:00 2006
|
||||||
@@ -15,7 +15,7 @@
|
@@ -15,7 +15,7 @@
|
||||||
from distutils.command.install_lib import install_lib
|
from distutils.command.install_lib import install_lib
|
||||||
|
|
||||||
|
@ -9,3 +9,21 @@
|
||||||
|
|
||||||
def add_dir_to_list(dirlist, dir):
|
def add_dir_to_list(dirlist, dir):
|
||||||
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
||||||
|
@@ -425,7 +425,7 @@
|
||||||
|
if self.compiler.find_library_file(lib_dirs, 'readline'):
|
||||||
|
readline_libs = ['readline']
|
||||||
|
if self.compiler.find_library_file(lib_dirs,
|
||||||
|
- 'ncursesw'):
|
||||||
|
+ 'xxxncursesw'):
|
||||||
|
readline_libs.append('ncursesw')
|
||||||
|
elif self.compiler.find_library_file(lib_dirs,
|
||||||
|
'ncurses'):
|
||||||
|
@@ -681,7 +681,7 @@
|
||||||
|
|
||||||
|
# Curses support, requiring the System V version of curses, often
|
||||||
|
# provided by the ncurses library.
|
||||||
|
- if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
|
||||||
|
+ if (self.compiler.find_library_file(lib_dirs, 'xxxncursesw')):
|
||||||
|
curses_libs = ['ncursesw']
|
||||||
|
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
||||||
|
libraries = curses_libs) )
|
||||||
|
|
Loading…
Add table
Reference in a new issue