Fixes needed to build htop (#3691)

* Fixes needed to build htop

* Build libncursesw.so, not libncurses.so

* Remove htop hack now that it is picking up newer ncurses

* Tell packages to link to new ncursesw libraries
This commit is contained in:
Adam J. Stewart 2017-04-05 16:03:11 -05:00 committed by GitHub
parent 87eafaa125
commit 745e2ce52f
6 changed files with 10 additions and 5 deletions

View File

@ -30,7 +30,12 @@ class Htop(AutotoolsPackage):
homepage = "https://github.com/hishamhm/htop" homepage = "https://github.com/hishamhm/htop"
url = "https://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz" url = "https://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz"
list_url = "https://hisham.hm/htop/releases"
list_depth = 1
version('2.0.2', '7d354d904bad591a931ad57e99fea84a') version('2.0.2', '7d354d904bad591a931ad57e99fea84a')
depends_on('ncurses') depends_on('ncurses')
def configure_args(self):
return ['--enable-shared']

View File

@ -36,3 +36,4 @@ class Htslib(AutotoolsPackage):
depends_on('zlib') depends_on('zlib')
depends_on('bzip2', when="@1.4:") depends_on('bzip2', when="@1.4:")
depends_on('xz')

View File

@ -67,14 +67,14 @@ def install(self, spec, prefix):
'MYLDFLAGS=-L%s -L%s' % ( 'MYLDFLAGS=-L%s -L%s' % (
spec['readline'].prefix.lib, spec['readline'].prefix.lib,
spec['ncurses'].prefix.lib), spec['ncurses'].prefix.lib),
'MYLIBS=-lncurses', 'MYLIBS=-lncursesw',
'CC=%s -std=gnu99' % spack_cc, 'CC=%s -std=gnu99' % spack_cc,
target) target)
make('INSTALL_TOP=%s' % prefix, make('INSTALL_TOP=%s' % prefix,
'MYLDFLAGS=-L%s -L%s' % ( 'MYLDFLAGS=-L%s -L%s' % (
spec['readline'].prefix.lib, spec['readline'].prefix.lib,
spec['ncurses'].prefix.lib), spec['ncurses'].prefix.lib),
'MYLIBS=-lncurses', 'MYLIBS=-lncursesw',
'CC=%s -std=gnu99' % spack_cc, 'CC=%s -std=gnu99' % spack_cc,
'install') 'install')

View File

@ -57,7 +57,6 @@ def configure_args(self):
'--with-cxx-shared', '--with-cxx-shared',
'--enable-widec', '--enable-widec',
'--enable-overwrite', '--enable-overwrite',
'--disable-lib-suffixes',
'--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)

View File

@ -45,4 +45,4 @@ class Readline(AutotoolsPackage):
patch('readline-6.3-upstream_fixes-1.patch', when='@6.3') patch('readline-6.3-upstream_fixes-1.patch', when='@6.3')
def build(self, spec, prefix): def build(self, spec, prefix):
make('SHLIB_LIBS=-lncurses') make('SHLIB_LIBS=-lncursesw')

View File

@ -46,7 +46,7 @@ class Samtools(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
if self.spec.version >= Version('1.3.1'): if self.spec.version >= Version('1.3.1'):
configure('--prefix={0}'.format(prefix), '--with-ncurses', configure('--prefix={0}'.format(prefix), '--with-ncurses',
'CURSES_LIB=-lncurses') 'CURSES_LIB=-lncursesw')
make() make()
make('install') make('install')
else: else: