zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tree for v1.8.0 (#15272)

Browse Source 
- add version info for v1.8.0

- v1.8.0 adds a new source file, `file.c`, which need to be included
  in our hardcoded list of objects to link.

  I discovered this while demonstrating "how easy it is to add a new
  package to Spack", only to scratch my head when it failed `spack
  install` but worked when I ran `make` in the stage dir.  Finally
  looked at tree/package.py and it All Became Clear.

  Perhaps someone should rewrite this to use MakefilePackage, but the
  Makefile starts off with a bunch of twisty turny "uncomment these
  lines to run on this platform", so it might not be worth it.
This commit is contained in:
George Hartzell 2020-02-28 15:52:41 -08:00 committed by GitHub
parent c10fb2a974
commit 53f4db938f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/tree/package.py
View File

@ -18,6 +18,7 @@ class Tree(Package):
homepage = "http://mama.indstate.edu/users/ice/tree/" homepage = "http://mama.indstate.edu/users/ice/tree/"
url = "http://mama.indstate.edu/users/ice/tree/src/tree-1.7.0.tgz" url = "http://mama.indstate.edu/users/ice/tree/src/tree-1.7.0.tgz"
version('1.8.0', sha256='715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2')
version('1.7.0', sha256='6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12') version('1.7.0', sha256='6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12')
def install(self, spec, prefix): def install(self, spec, prefix):
@ -30,6 +31,10 @@ def install(self, spec, prefix):
'hash.o', 'hash.o',
'color.o' 'color.o'
] ]
# version 1.8.0 added file.c
if spec.version >= Version('1.8.0'):
objs.append('file.o')
if (sys.platform == 'darwin'): if (sys.platform == 'darwin'):
objs.append('strverscmp.o') objs.append('strverscmp.o')