hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ncurses: keep ncurses and ncursesw headers (#27372)

Browse source 
- Copy ncursesw headers to include/ (matches prior behavior)
- include/ncurses no-longer keeps a copy of ncursesw headers
This commit is contained in:
Dylan Simon 2021-12-08 02:04:49 -05:00 committed by GitHub
parent d458e82286
commit 39e6f987bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/ncurses/package.py
View file

@ -101,7 +101,8 @@ def configure(self, spec, prefix):
'--enable-overwrite', '--enable-overwrite',
'--without-ada', '--without-ada',
'--enable-pc-files', '--enable-pc-files',
'--with-pkg-config-libdir={0}/lib/pkgconfig'.format(self.prefix) '--with-pkg-config-libdir={0}/lib/pkgconfig'.format(self.prefix),
'--disable-overwrite'
] ]
nwide_opts = ['--disable-widec', nwide_opts = ['--disable-widec',
@ -148,14 +149,11 @@ def install(self, spec, prefix):
with working_dir('build_ncursesw'): with working_dir('build_ncursesw'):
make('install') make('install')
# fix for packages like hstr that use "#include <ncurses/ncurses.h>" # fix for packages that use "#include <ncurses.h>" (use wide by default)
headers = glob.glob(os.path.join(prefix.include, '*')) headers = glob.glob(os.path.join(prefix.include, 'ncursesw', '*.h'))
for p_dir in ['ncurses', 'ncursesw']:
path = os.path.join(prefix.include, p_dir)
if not os.path.exists(path):
os.makedirs(path)
for header in headers: for header in headers:
install(header, path) h = os.path.basename(header)
os.symlink(os.path.join('ncursesw', h), os.path.join(prefix.include, h))
@property @property
def libs(self): def libs(self):