From 8da1dd2b4526241e70df3bb17c93439b26f389dd Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 8 Jan 2016 21:32:17 -0500 Subject: Require cmake --- var/spack/packages/julia/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/julia/package.py b/var/spack/packages/julia/package.py index 9fd946c905..6e81564e17 100644 --- a/var/spack/packages/julia/package.py +++ b/var/spack/packages/julia/package.py @@ -9,7 +9,7 @@ class Julia(Package): version('0.4.2', 'ccfeb4f4090c8b31083f5e1ccb03eb06') # Build-time dependencies - # depends_on("cmake") + depends_on("cmake") # depends_on("awk") # depends_on("m4") # depends_on("pkg-config") -- cgit v1.2.3-70-g09d2 From 04f908a957c69ae03b82482d37b87d74bd4a0064 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 8 Jan 2016 21:41:35 -0500 Subject: Require cmake @2.8: --- var/spack/packages/julia/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/julia/package.py b/var/spack/packages/julia/package.py index 6e81564e17..40f94269ab 100644 --- a/var/spack/packages/julia/package.py +++ b/var/spack/packages/julia/package.py @@ -9,7 +9,7 @@ class Julia(Package): version('0.4.2', 'ccfeb4f4090c8b31083f5e1ccb03eb06') # Build-time dependencies - depends_on("cmake") + depends_on("cmake @2.8:") # depends_on("awk") # depends_on("m4") # depends_on("pkg-config") -- cgit v1.2.3-70-g09d2 From b18732173a22aa431165fa321abac7924f66b1e1 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 8 Jan 2016 23:21:54 -0500 Subject: Require Python to build Julia --- var/spack/packages/julia/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/packages/julia/package.py b/var/spack/packages/julia/package.py index 40f94269ab..80a58ab745 100644 --- a/var/spack/packages/julia/package.py +++ b/var/spack/packages/julia/package.py @@ -13,6 +13,7 @@ class Julia(Package): # 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. -- cgit v1.2.3-70-g09d2 From 79a1de2f17094e7e5592bed8cd9040bff9f43cf5 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 9 Jan 2016 10:47:31 -0500 Subject: Add a patch to prevent Julia running out of virtual memory --- var/spack/packages/julia/gc.patch | 11 +++++++++++ var/spack/packages/julia/package.py | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 var/spack/packages/julia/gc.patch (limited to 'var') 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 80a58ab745..d978842d9c 100644 --- a/var/spack/packages/julia/package.py +++ b/var/spack/packages/julia/package.py @@ -8,6 +8,8 @@ class Julia(Package): version('0.4.2', 'ccfeb4f4090c8b31083f5e1ccb03eb06') + patch('gc.patch') + # Build-time dependencies depends_on("cmake @2.8:") # depends_on("awk") -- cgit v1.2.3-70-g09d2