diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-11 13:48:09 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-11 13:48:09 -0800 |
| commit | 309425833ba7f612bf8c5cdb62a7a01e70bbb161 (patch) | |
| tree | eceafe7a62cbf3795f3fdaa1b6af4cb017b9bd94 /var | |
| parent | 9bbb9a8f0a6393534bcfe153f3a79cc01164180e (diff) | |
| parent | 79a1de2f17094e7e5592bed8cd9040bff9f43cf5 (diff) | |
| download | spack-309425833ba7f612bf8c5cdb62a7a01e70bbb161.tar.gz spack-309425833ba7f612bf8c5cdb62a7a01e70bbb161.tar.bz2 spack-309425833ba7f612bf8c5cdb62a7a01e70bbb161.tar.xz spack-309425833ba7f612bf8c5cdb62a7a01e70bbb161.zip | |
Merge pull request #325 from eschnett/eschnett/julia-update
Several small updates to Julia
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/julia/gc.patch | 11 | ||||
| -rw-r--r-- | var/spack/packages/julia/package.py | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/var/spack/packages/julia/gc.patch b/var/spack/packages/julia/gc.patch new file mode 100644 index 0000000000..6db69c6c1b --- /dev/null +++ b/var/spack/packages/julia/gc.patch @@ -0,0 +1,11 @@ +--- julia/src/gc.c ++++ julia/src/gc.c +@@ -162,7 +162,7 @@ + // A region is contiguous storage for up to REGION_PG_COUNT naturally aligned GC_PAGE_SZ pages + // It uses a very naive allocator (see malloc_page & free_page) + #if defined(_P64) && !defined(_COMPILER_MICROSOFT_) +-#define REGION_PG_COUNT 16*8*4096 // 8G because virtual memory is cheap ++#define REGION_PG_COUNT 8*4096 // 512M + #else + #define REGION_PG_COUNT 8*4096 // 512M + #endif diff --git a/var/spack/packages/julia/package.py b/var/spack/packages/julia/package.py index 9fd946c905..d978842d9c 100644 --- a/var/spack/packages/julia/package.py +++ b/var/spack/packages/julia/package.py @@ -8,11 +8,14 @@ class Julia(Package): version('0.4.2', 'ccfeb4f4090c8b31083f5e1ccb03eb06') + patch('gc.patch') + # Build-time dependencies - # depends_on("cmake") + depends_on("cmake @2.8:") # depends_on("awk") # depends_on("m4") # depends_on("pkg-config") + depends_on("python @2.6:2.9") # I think that Julia requires the dependencies above, but it builds find (on # my system) without these. We should enable them as necessary. |