From 39e6f987bb49637c6a107bb68f93b2c652d52670 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Wed, 8 Dec 2021 02:04:49 -0500 Subject: [PATCH] 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 --- .../repos/builtin/packages/ncurses/package.py | 16 +++++++--------- 1 file 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 @@ def configure(self, spec, prefix): '--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 @@ def install(self, spec, prefix): with working_dir('build_ncursesw'): make('install') - # fix for packages like hstr that use "#include " - 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 " (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):