From 2e3355d2f9d7f62979fcf7b5f7736c37a1e264b9 Mon Sep 17 00:00:00 2001 From: Sinan Date: Sun, 25 Oct 2020 18:39:44 -0700 Subject: package/pmdk add variants, version 1.9 (#19512) * package/pmdk add variants, version 1.9 * add dependency * Update var/spack/repos/builtin/packages/pmdk/package.py Co-authored-by: Adam J. Stewart Co-authored-by: sbulut Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/pmdk/package.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/pmdk/package.py b/var/spack/repos/builtin/packages/pmdk/package.py index c8c836e4eb..54e777bf52 100644 --- a/var/spack/repos/builtin/packages/pmdk/package.py +++ b/var/spack/repos/builtin/packages/pmdk/package.py @@ -16,13 +16,20 @@ class Pmdk(Package): url = "https://github.com/pmem/pmdk/archive/1.5.tar.gz" git = "https://github.com/pmem/pmdk.git" - version('develop', branch='master') + version('master', branch='master') + version('1.9', sha256='2c8a148070f4bbf9f82e2ca63d2f84cb5101fc6e72c1ba93cc673ca3b7b95467') version('1.8', sha256='a241ea76ef76d233cb92826b6823ed48091a2fb6963282a4fea848dbce68aa21') - version('1.7', sha256='865ce1b422bc83109cb4a63dcff8fd1077eea3617e668faf6a043208d8be03ca') + version('1.7', sha256='865ce1b422bc83109cb4a63dcff8fd1077eea3617e668faf6a043208d8be03ca') version('1.6', sha256='3b99e6c30709326a94d2e73a9247a8dfb58d0a394c5b7714e5c3d8a3ad2e2e9f') version('1.5', sha256='6b069d7207febeb62440e89245e8b18fcdf40b6170d2ec2ef33c252ed16db2d4') + variant('ndctl', default=False, description='Build components requiring ndctl') + variant('doc', default=False, description='Build documentation') + variant('experimental', default=False, description='Build experimental stuff') + variant('rpmem', default=False, description='Build remote persistent memory components') + depends_on('ncurses', when='@1.6:') + depends_on('libfabric', when='+rpmem') # documentation requires doxygen and a bunch of other dependencies patch('0001-make-doc-building-explicit.patch', when="@:1.7") patch('pmem-1.8-disable-docs.patch', when='@1.8') @@ -30,9 +37,11 @@ class Pmdk(Package): def install(self, spec, prefix): make_args = [ 'prefix=%s' % prefix, - 'NDCTL_ENABLE=n', 'EXTRA_CFLAGS=-Wno-error', - 'BUILD_RPMEM=n', + 'NDCTL_ENABLE={0}'.format('y' if '+ndctl' in spec else 'n'), + 'BUILD_RPMEM={0}'.format('y' if '+rpmem' in spec else 'n'), + 'DOC={0}'.format('y' if '+doc' in spec else 'n'), + 'EXPERIMENTAL={0}'.format('y' if '+experimental' in spec else 'n'), ] # pmdk prior to 1.8 was particular about the ARCH specification, must -- cgit v1.2.3-60-g2f50