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

Merge pull request #1093 from eschnett/eschnett/julia-update

Browse Source 
Update Julia to 0.4.6
This commit is contained in:
Todd Gamblin 2016-06-26 22:28:33 -07:00 committed by GitHub
commit 7d85902f37
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
var/spack/repos/builtin/packages/julia/package.py
View File

@ -22,8 +22,9 @@
# License along with this program; if not, write to the Free Software # License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import os
class Julia(Package): class Julia(Package):
"""The Julia Language: A fresh approach to technical computing""" """The Julia Language: A fresh approach to technical computing"""
@ -32,10 +33,14 @@ class Julia(Package):
version('master', version('master',
git='https://github.com/JuliaLang/julia.git', branch='master') git='https://github.com/JuliaLang/julia.git', branch='master')
version('release-0.4',
git='https://github.com/JuliaLang/julia.git', branch='release-0.4')
version('0.4.6', 'd88db18c579049c23ab8ef427ccedf5d', preferred=True)
version('0.4.5', '69141ff5aa6cee7c0ec8c85a34aa49a6') version('0.4.5', '69141ff5aa6cee7c0ec8c85a34aa49a6')
version('0.4.3', '8a4a59fd335b05090dd1ebefbbe5aaac') version('0.4.3', '8a4a59fd335b05090dd1ebefbbe5aaac')
patch('gc.patch') patch('gc.patch', when='@0.4:0.4.5')
patch('gc.patch', when='@release-0.4')
patch('openblas.patch', when='@0.4:0.4.5') patch('openblas.patch', when='@0.4:0.4.5')
# Build-time dependencies: # Build-time dependencies:
@ -92,24 +97,20 @@ class Julia(Package):
depends_on("mpi") depends_on("mpi")
def install(self, spec, prefix): def install(self, spec, prefix):
if '@master' in spec:
# Julia needs to know the offset from a specific commit
git = which('git')
git('fetch', '--unshallow')
# Explicitly setting CC, CXX, or FC breaks building libuv, one # Explicitly setting CC, CXX, or FC breaks building libuv, one
# of Julia's dependencies. This might be a Darwin-specific # of Julia's dependencies. This might be a Darwin-specific
# problem. Given how Spack sets up compilers, Julia should # problem. Given how Spack sets up compilers, Julia should
# still use Spack's compilers, even if we don't specify them # still use Spack's compilers, even if we don't specify them
# explicitly. # explicitly.
options = [#"CC=cc", options = [
#"CXX=c++", # "CC=cc",
#"FC=fc", # "CXX=c++",
#"USE_SYSTEM_ARPACK=1", # "FC=fc",
#"USE_SYSTEM_FFTW=1", # "USE_SYSTEM_ARPACK=1",
#"USE_SYSTEM_GMP=1", # "USE_SYSTEM_FFTW=1",
#"USE_SYSTEM_MPFR=1", # "USE_SYSTEM_GMP=1",
#TODO "USE_SYSTEM_PCRE=1", # "USE_SYSTEM_MPFR=1",
# "USE_SYSTEM_PCRE=1",
"prefix=%s" % prefix] "prefix=%s" % prefix]
with open('Make.user', 'w') as f: with open('Make.user', 'w') as f:
f.write('\n'.join(options) + '\n') f.write('\n'.join(options) + '\n')