diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-04-05 16:03:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 16:03:11 -0500 |
| commit | 745e2ce52ffb33a8da9856e64c4571303f274163 (patch) | |
| tree | bb3041a71a68f1642eb6bd67a7559fafd7f61b18 /var | |
| parent | 87eafaa125db2407bb54a84f69e1ad67a4f27f99 (diff) | |
| download | spack-745e2ce52ffb33a8da9856e64c4571303f274163.tar.gz spack-745e2ce52ffb33a8da9856e64c4571303f274163.tar.bz2 spack-745e2ce52ffb33a8da9856e64c4571303f274163.tar.xz spack-745e2ce52ffb33a8da9856e64c4571303f274163.zip | |
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
Diffstat (limited to 'var')
6 files changed, 10 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/htop/package.py b/var/spack/repos/builtin/packages/htop/package.py index 7a7cc418ce..45dc6f3132 100644 --- a/var/spack/repos/builtin/packages/htop/package.py +++ b/var/spack/repos/builtin/packages/htop/package.py @@ -30,7 +30,12 @@ class Htop(AutotoolsPackage): homepage = "https://github.com/hishamhm/htop" 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') depends_on('ncurses') + + def configure_args(self): + return ['--enable-shared'] diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index 20db1c918b..8914a5c1e9 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -36,3 +36,4 @@ class Htslib(AutotoolsPackage): depends_on('zlib') depends_on('bzip2', when="@1.4:") + depends_on('xz') diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 78938beff9..b0d8b69943 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -67,14 +67,14 @@ class Lua(Package): 'MYLDFLAGS=-L%s -L%s' % ( spec['readline'].prefix.lib, spec['ncurses'].prefix.lib), - 'MYLIBS=-lncurses', + 'MYLIBS=-lncursesw', 'CC=%s -std=gnu99' % spack_cc, target) make('INSTALL_TOP=%s' % prefix, 'MYLDFLAGS=-L%s -L%s' % ( spec['readline'].prefix.lib, spec['ncurses'].prefix.lib), - 'MYLIBS=-lncurses', + 'MYLIBS=-lncursesw', 'CC=%s -std=gnu99' % spack_cc, 'install') diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index 9a964d4d8a..8a8091d05d 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -57,7 +57,6 @@ class Ncurses(AutotoolsPackage): '--with-cxx-shared', '--enable-widec', '--enable-overwrite', - '--disable-lib-suffixes', '--without-ada', '--enable-pc-files', '--with-pkg-config-libdir={0}/lib/pkgconfig'.format(self.prefix) diff --git a/var/spack/repos/builtin/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py index e0b0e0d4b2..5beafd5829 100644 --- a/var/spack/repos/builtin/packages/readline/package.py +++ b/var/spack/repos/builtin/packages/readline/package.py @@ -45,4 +45,4 @@ class Readline(AutotoolsPackage): patch('readline-6.3-upstream_fixes-1.patch', when='@6.3') def build(self, spec, prefix): - make('SHLIB_LIBS=-lncurses') + make('SHLIB_LIBS=-lncursesw') diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index a616725068..915b25b61b 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -46,7 +46,7 @@ class Samtools(Package): def install(self, spec, prefix): if self.spec.version >= Version('1.3.1'): configure('--prefix={0}'.format(prefix), '--with-ncurses', - 'CURSES_LIB=-lncurses') + 'CURSES_LIB=-lncursesw') make() make('install') else: |