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

Clean up now that submodules are properly supported. (#4053)

Browse Source
This commit is contained in:
Christoph Junghans 2017-04-29 20:43:16 -07:00 committed by Todd Gamblin
parent 0a9beccc4a
commit 110f68a83f
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/flecsale/package.py
View File

@ -31,7 +31,7 @@ class Flecsale(CMakePackage):
homepage = "https://github.com/laristra/flecsale" homepage = "https://github.com/laristra/flecsale"
url = "https://github.com/laristra/flecsale/tarball/v1.0" url = "https://github.com/laristra/flecsale/tarball/v1.0"
version('develop', git='https://github.com/laristra/flecsale', branch='master', submodules=False) version('develop', git='https://github.com/laristra/flecsale', branch='master', submodules=True)
variant('debug', default=False, description='Build debug version') variant('debug', default=False, description='Build debug version')
variant('mpi', default=True, variant('mpi', default=True,
@ -43,12 +43,6 @@ class Flecsale(CMakePackage):
depends_on("python@2:2.8") depends_on("python@2:2.8")
depends_on("openssl") depends_on("openssl")
# drop when #3958 has been merged
def do_fetch(self, mirror_only=True):
super(Flecsale, self).do_fetch(mirror_only)
git = which("git")
git('submodule', 'update', '--init', '--recursive')
def build_type(self): def build_type(self):
spec = self.spec spec = self.spec
if '+debug' in spec: if '+debug' in spec:

8
var/spack/repos/builtin/packages/flecsi/package.py
View File

@ -39,7 +39,7 @@ class Flecsi(CMakePackage):
homepage = "http://flecsi.lanl.gov/" homepage = "http://flecsi.lanl.gov/"
url = "https://github.com/laristra/flecsi/tarball/v1.0" url = "https://github.com/laristra/flecsi/tarball/v1.0"
version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=False) version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=True)
variant('debug', default=False, description='Build debug version') variant('debug', default=False, description='Build debug version')
variant('mpi', default=True, variant('mpi', default=True,
@ -49,12 +49,6 @@ class Flecsi(CMakePackage):
depends_on("legion+shared", when='~mpi') depends_on("legion+shared", when='~mpi')
depends_on("legion+shared+mpi", when='+mpi') depends_on("legion+shared+mpi", when='+mpi')
# drop when #3958 has been merged
def do_fetch(self, mirror_only=True):
super(Flecsi, self).do_fetch(mirror_only)
git = which("git")
git('-C', 'flecsi', 'submodule', 'update', '--init', '--recursive')
def build_type(self): def build_type(self):
spec = self.spec spec = self.spec
if '+debug' in spec: if '+debug' in spec:

8
var/spack/repos/builtin/packages/portage/package.py
View File

@ -34,7 +34,7 @@ class Portage(CMakePackage):
homepage = "http://portage.lanl.gov/" homepage = "http://portage.lanl.gov/"
url = "https://github.com/laristra/portage/tarball/v1.0" url = "https://github.com/laristra/portage/tarball/v1.0"
version('develop', git='https://github.com/laristra/portage', branch='master', submodules=False) version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True)
variant('debug', default=False, description='Build debug version') variant('debug', default=False, description='Build debug version')
variant('mpi', default=True, description='Support MPI') variant('mpi', default=True, description='Support MPI')
@ -42,12 +42,6 @@ class Portage(CMakePackage):
depends_on("cmake@3.1:", type='build') depends_on("cmake@3.1:", type='build')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
# drop when #3958 has been merged
def do_fetch(self, mirror_only=True):
super(Portage, self).do_fetch(mirror_only)
git = which("git")
git('submodule', 'update', '--init', '--recursive')
def build_type(self): def build_type(self):
spec = self.spec spec = self.spec
if '+debug' in spec: if '+debug' in spec: