summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorhealther <healther@users.noreply.github.com>2018-04-19 14:23:16 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2018-04-19 07:23:16 -0500
commit6d1097f99be31e7764e649d6ae67bb9391e0b001 (patch)
tree3a713d3a510f3593c598259c293fb39d3defa85d /var
parent4ed613d7e1beb089b78cd7aa8112424db1af36b0 (diff)
downloadspack-6d1097f99be31e7764e649d6ae67bb9391e0b001.tar.gz
spack-6d1097f99be31e7764e649d6ae67bb9391e0b001.tar.bz2
spack-6d1097f99be31e7764e649d6ae67bb9391e0b001.tar.xz
spack-6d1097f99be31e7764e649d6ae67bb9391e0b001.zip
add variants and conflicts for curl (#7804)
* add variants and conflicts for curl * darwinssl - Apple's SSL/TLS implementation * libssh - use libssh implementation * add darwin conflict for libssh{,2} * add linux conflict for darwinssl * remove openssl when +darwinssl * Update package.py * Update package.py * Update package.py * Update package.py
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/curl/package.py31
-rw-r--r--var/spack/repos/builtin/packages/libssh/package.py37
2 files changed, 61 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py
index be7a0f659f..90f6110372 100644
--- a/var/spack/repos/builtin/packages/curl/package.py
+++ b/var/spack/repos/builtin/packages/curl/package.py
@@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
+import sys
class Curl(AutotoolsPackage):
@@ -49,21 +50,37 @@ class Curl(AutotoolsPackage):
version('7.43.0', '11bddbb452a8b766b932f859aaeeed39')
version('7.42.1', '296945012ce647b94083ed427c1877a8')
- variant('nghttp2', default=False, description='build nghttp2 library (requires C++11)')
- variant('libssh2', default=False, description='enable libssh2 support')
+ variant('nghttp2', default=False, description='build nghttp2 library (requires C++11)')
+ variant('libssh2', default=False, description='enable libssh2 support')
+ variant('libssh', default=False, description='enable libssh support') # , when='7.58:')
+ variant('darwinssl', default=sys.platform == 'darwin', description="use Apple's SSL/TLS implementation")
- depends_on('openssl')
+ conflicts('+libssh', when='@:7.57.99')
+ # on OSX and --with-ssh the configure steps fails with
+ # one or more libs available at link-time are not available run-time
+ # unless the libssh are installed externally (e.g. via homebrew), even
+ # though spack isn't supposed to know about such a libssh installation.
+ # C.f. https://github.com/spack/spack/issues/7777
+ conflicts('platform=darwin', when='+libssh2')
+ conflicts('platform=darwin', when='+libssh')
+ conflicts('platform=linux', when='+darwinssl')
+
+ depends_on('openssl', when='~darwinssl')
depends_on('zlib')
depends_on('nghttp2', when='+nghttp2')
depends_on('libssh2', when='+libssh2')
+ depends_on('libssh', when='+libssh')
def configure_args(self):
spec = self.spec
- args = [
- '--with-zlib={0}'.format(spec['zlib'].prefix),
- '--with-ssl={0}'.format(spec['openssl'].prefix)
- ]
+ args = ['--with-zlib={0}'.format(spec['zlib'].prefix)]
+ if self.satisfies('+darwinssl'):
+ args.append('--with-darwinssl')
+ else:
+ args.append('--with-ssl={0}'.format(spec['openssl'].prefix))
+
args += self.with_or_without('nghttp2')
args += self.with_or_without('libssh2')
+ args += self.with_or_without('libssh')
return args
diff --git a/var/spack/repos/builtin/packages/libssh/package.py b/var/spack/repos/builtin/packages/libssh/package.py
new file mode 100644
index 0000000000..7a99ebbd65
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libssh/package.py
@@ -0,0 +1,37 @@
+##############################################################################
+# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/spack/spack
+# Please also see the NOTICE and LICENSE files for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libssh(CMakePackage):
+ """libssh: the SSH library"""
+
+ homepage = "https://www.libssh.org"
+ url = "https://red.libssh.org/attachments/download/218/libssh-0.7.5.tar.xz"
+
+ version('0.7.5', 'd3fc864208bf607ad87cdee836894feb')
+
+ depends_on('openssl')
+ depends_on('zlib')