From 554a4d01a60dc892ee537f5c489d0b8c3ff27ab8 Mon Sep 17 00:00:00 2001 From: William Krinsman Date: Wed, 21 Aug 2019 10:54:48 -0700 Subject: [PATCH 1/2] Updated filename for 1.0 version of Julia. --- recipe/build.sh | 2 +- recipe/{juliarc.jl => startup.jl} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename recipe/{juliarc.jl => startup.jl} (100%) diff --git a/recipe/build.sh b/recipe/build.sh index e83f8379..ec957dce 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -51,4 +51,4 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ install # Configure juliarc to use conda environment -cat "${RECIPE_DIR}/juliarc.jl" >> "${PREFIX}/etc/julia/juliarc.jl" +cat "${RECIPE_DIR}/startup.jl" >> "${PREFIX}/etc/julia/startup.jl" diff --git a/recipe/juliarc.jl b/recipe/startup.jl similarity index 100% rename from recipe/juliarc.jl rename to recipe/startup.jl From 25b6fd6c75cc8263da6539042a5ece0b34d1db40 Mon Sep 17 00:00:00 2001 From: William Krinsman Date: Wed, 21 Aug 2019 12:59:29 -0700 Subject: [PATCH 2/2] Removed reference to LOAD_CACHE_PATH, which was deleted, and changed to new DEPOT_PATH --- recipe/startup.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/startup.jl b/recipe/startup.jl index 544d7d45..6ccd1fbc 100644 --- a/recipe/startup.jl +++ b/recipe/startup.jl @@ -2,5 +2,5 @@ JULIA_PREFIX = abspath(joinpath(Base.source_path(), "..", "..", "..")) if !("JULIA_PKGDIR" in keys(ENV)) ENV["JULIA_PKGDIR"] = joinpath(JULIA_PREFIX, "share", "julia", "site") - Base.LOAD_CACHE_PATH[1] = joinpath(ENV["JULIA_PKGDIR"], "lib", string("v", join(split(string(VERSION), ".")[1:2], "."))) + Base.DEPOT_PATH[1] = joinpath(ENV["JULIA_PKGDIR"], "lib", string("v", join(split(string(VERSION), ".")[1:2], "."))) end