summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDylan Simon <dylan@dylex.net>2021-12-08 02:04:49 -0500
committerGitHub <noreply@github.com>2021-12-08 00:04:49 -0700
commit39e6f987bb49637c6a107bb68f93b2c652d52670 (patch)
tree4fe217c054c1236cfd7c3c7b5f46c39b546c9caf /var
parentd458e8228617ff1641a5903a8cce68c6fa7c3564 (diff)
downloadspack-39e6f987bb49637c6a107bb68f93b2c652d52670.tar.gz
spack-39e6f987bb49637c6a107bb68f93b2c652d52670.tar.bz2
spack-39e6f987bb49637c6a107bb68f93b2c652d52670.tar.xz
spack-39e6f987bb49637c6a107bb68f93b2c652d52670.zip
ncurses: keep ncurses and ncursesw headers (#27372)
- Copy ncursesw headers to include/ (matches prior behavior) - include/ncurses no-longer keeps a copy of ncursesw headers
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/ncurses/package.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py
index 22f331112f..08b1bae47e 100644
--- a/var/spack/repos/builtin/packages/ncurses/package.py
+++ b/var/spack/repos/builtin/packages/ncurses/package.py
@@ -101,7 +101,8 @@ class Ncurses(AutotoolsPackage, GNUMirrorPackage):
'--enable-overwrite',
'--without-ada',
'--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',
@@ -148,14 +149,11 @@ class Ncurses(AutotoolsPackage, GNUMirrorPackage):
with working_dir('build_ncursesw'):
make('install')
- # fix for packages like hstr that use "#include <ncurses/ncurses.h>"
- headers = glob.glob(os.path.join(prefix.include, '*'))
- 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:
- install(header, path)
+ # fix for packages that use "#include <ncurses.h>" (use wide by default)
+ headers = glob.glob(os.path.join(prefix.include, 'ncursesw', '*.h'))
+ for header in headers:
+ h = os.path.basename(header)
+ os.symlink(os.path.join('ncursesw', h), os.path.join(prefix.include, h))
@property
def libs(self):