From 245dd3cc2eff83fc17b8fc60dbdfa8d1bef25700 Mon Sep 17 00:00:00 2001
From: Matt Johnson <mjohnson541@gmail.com>
Date: Tue, 19 May 2020 12:37:28 -0400
Subject: [PATCH 01/37] set JULIA_DEPOT_PATH when conda env activated

---
 recipe/build.sh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/recipe/build.sh b/recipe/build.sh
index 280f469e..28461ccd 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -6,6 +6,27 @@ export LIBRARY_PATH=${PREFIX}/lib
 export CMAKE_PREFIX_PATH=${PREFIX}
 export PATH="${PREFIX}/bin:${PATH}"
 
+#set JULIA_DEPOT_PATH in conda env
+export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site:$JULIA_DEPOT_PATH" 
+ACTIVATE_ENV="${PREFIX}/etc/conda/activate.d/env_vars.sh"
+DEACTIVATE_ENV="${PREFIX}/etc/conda/deactivate.d/env_vars.sh"
+if [ -f "$ACTIVATE_ENV" ]; then
+	echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site:\$JULIA_DEPOT_PATH\"" >> "$ACTIVATE_ENV"
+else
+	mkdir -p ${PREFIX}/etc/conda/activate.d
+	touch ${PREFIX}/etc/conda/activate.d/env_vars.sh
+	echo '#!/bin/sh' >> $ACTIVATE_ENV
+	echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site:\$JULIA_DEPOT_PATH\"" >> "$ACTIVATE_ENV"
+fi
+if [ -f "$DEACTIVATE_ENV" ]; then
+	echo "unset JULIA_DEPOT_PATH" >> "$DEACTIVATE_ENV"
+else
+	mkdir -p ${PREFIX}/etc/conda/deactivate.d
+	touch ${PREFIX}/etc/conda/deactivate.d/env_vars.sh
+	echo '#!/bin/sh' >> "$DEACTIVATE_ENV"
+	echo "unset JULIA_DEPOT_PATH" >> "$DEACTIVATE_ENV"
+fi
+
 # Hack to suppress building docs
 cat > doc/Makefile << EOF
 html :	

From eb79265ab4e72a916d5ad25d35cb83989fd85585 Mon Sep 17 00:00:00 2001
From: Matt Johnson <mjohnson541@gmail.com>
Date: Tue, 19 May 2020 14:40:39 -0400
Subject: [PATCH 02/37] simplify recipe and add back up variables

---
 recipe/build.sh              | 24 ++++++------------------
 recipe/scripts/activate.sh   |  2 ++
 recipe/scripts/deactivate.sh |  6 ++++++
 3 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 recipe/scripts/activate.sh
 create mode 100644 recipe/scripts/deactivate.sh

diff --git a/recipe/build.sh b/recipe/build.sh
index 28461ccd..f08c2494 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -8,24 +8,12 @@ export PATH="${PREFIX}/bin:${PATH}"
 
 #set JULIA_DEPOT_PATH in conda env
 export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site:$JULIA_DEPOT_PATH" 
-ACTIVATE_ENV="${PREFIX}/etc/conda/activate.d/env_vars.sh"
-DEACTIVATE_ENV="${PREFIX}/etc/conda/deactivate.d/env_vars.sh"
-if [ -f "$ACTIVATE_ENV" ]; then
-	echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site:\$JULIA_DEPOT_PATH\"" >> "$ACTIVATE_ENV"
-else
-	mkdir -p ${PREFIX}/etc/conda/activate.d
-	touch ${PREFIX}/etc/conda/activate.d/env_vars.sh
-	echo '#!/bin/sh' >> $ACTIVATE_ENV
-	echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site:\$JULIA_DEPOT_PATH\"" >> "$ACTIVATE_ENV"
-fi
-if [ -f "$DEACTIVATE_ENV" ]; then
-	echo "unset JULIA_DEPOT_PATH" >> "$DEACTIVATE_ENV"
-else
-	mkdir -p ${PREFIX}/etc/conda/deactivate.d
-	touch ${PREFIX}/etc/conda/deactivate.d/env_vars.sh
-	echo '#!/bin/sh' >> "$DEACTIVATE_ENV"
-	echo "unset JULIA_DEPOT_PATH" >> "$DEACTIVATE_ENV"
-fi
+
+for CHANGE in "activate" "deactivate"
+do
+    mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
+    cp "${RECIPE_DIR}/scripts/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
+done
 
 # Hack to suppress building docs
 cat > doc/Makefile << EOF
diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
new file mode 100644
index 00000000..edb5623e
--- /dev/null
+++ b/recipe/scripts/activate.sh
@@ -0,0 +1,2 @@
+export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
+export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site:$JULIA_DEPOT_PATH"
\ No newline at end of file
diff --git a/recipe/scripts/deactivate.sh b/recipe/scripts/deactivate.sh
new file mode 100644
index 00000000..3dd1e7fa
--- /dev/null
+++ b/recipe/scripts/deactivate.sh
@@ -0,0 +1,6 @@
+export JULIA_DEPOT_PATH=$JULIA_DEPOT_PATH_BACKUP
+unset JULIA_DEPOT_PATH_BACKUP
+
+if [ -z $JULIA_DEPOT_PATH ]; then
+    unset JULIA_DEPOT_PATH
+fi

From 9425681b070ac71cfb938f739a5c82dc60b3dadd Mon Sep 17 00:00:00 2001
From: Matt Johnson <mjohnson541@gmail.com>
Date: Mon, 13 Jul 2020 13:46:01 -0400
Subject: [PATCH 03/37] don't run juliarc.jl

---
 recipe/build.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index f08c2494..b4ce4c7f 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -64,6 +64,3 @@ make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \
  TAGGED_RELEASE_BANNER="conda-forge-julia release" \
  CC=$CC CXX=$CXX FC=$FC \
  install
-
-# Configure juliarc to use conda environment
-cat "${RECIPE_DIR}/juliarc.jl" >> "${PREFIX}/etc/julia/juliarc.jl"

From cfc8813a48d4a9e4948874fea7ecd5df79915fa0 Mon Sep 17 00:00:00 2001
From: Matt Johnson <mjohnson541@gmail.com>
Date: Tue, 10 Aug 2021 16:33:40 -0400
Subject: [PATCH 04/37] improve activate.d/deactivate.d file editing

---
 recipe/build.sh | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index b4ce4c7f..38fa45c6 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -9,11 +9,25 @@ export PATH="${PREFIX}/bin:${PATH}"
 #set JULIA_DEPOT_PATH in conda env
 export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site:$JULIA_DEPOT_PATH" 
 
-for CHANGE in "activate" "deactivate"
-do
-    mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
-    cp "${RECIPE_DIR}/scripts/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
-done
+ACTIVATE_ENV="${PREFIX}/etc/conda/activate.d/${PKG_NAME}_activate.sh"
+DEACTIVATE_ENV="${PREFIX}/etc/conda/deactivate.d/${PKG_NAME}_deactivate.sh"
+
+if [ -f "$ACTIVATE_ENV" ]; then
+        echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
+else
+        mkdir -p ${PREFIX}/etc/conda/activate.d
+        touch ${PREFIX}/etc/conda/activate.d/${PKG_NAME}_activate.sh
+        echo '#!/bin/sh' >> $ACTIVATE_ENV
+        echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
+fi
+if [ -f "$DEACTIVATE_ENV" ]; then
+        echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
+else
+        mkdir -p ${PREFIX}/etc/conda/deactivate.d
+        touch ${PREFIX}/etc/conda/deactivate.d/${PKG_NAME}_deactivate.sh
+        echo '#!/bin/sh' >> $DEACTIVATE_ENV
+        echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
+fi
 
 # Hack to suppress building docs
 cat > doc/Makefile << EOF

From ff6c977c2e4452f0776f4c7db786c4a98deec7c7 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <mkitti@users.noreply.github.com>
Date: Fri, 10 Sep 2021 15:13:00 -0400
Subject: [PATCH 05/37] Apply suggestions from code review by @mkitti

* This uses the activate.sh and deactivate.sh scripts that backup the environment variable.
* Create a new shared environment located in the site depot for the environment rather than continuing to use the default one in ~/.julia/environments/v#.#.
---
 recipe/build.sh              | 27 +++++++--------------------
 recipe/scripts/activate.sh   |  4 +++-
 recipe/scripts/deactivate.sh |  5 +++++
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index 38fa45c6..564fe054 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -9,26 +9,13 @@ export PATH="${PREFIX}/bin:${PATH}"
 #set JULIA_DEPOT_PATH in conda env
 export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site:$JULIA_DEPOT_PATH" 
 
-ACTIVATE_ENV="${PREFIX}/etc/conda/activate.d/${PKG_NAME}_activate.sh"
-DEACTIVATE_ENV="${PREFIX}/etc/conda/deactivate.d/${PKG_NAME}_deactivate.sh"
-
-if [ -f "$ACTIVATE_ENV" ]; then
-        echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
-else
-        mkdir -p ${PREFIX}/etc/conda/activate.d
-        touch ${PREFIX}/etc/conda/activate.d/${PKG_NAME}_activate.sh
-        echo '#!/bin/sh' >> $ACTIVATE_ENV
-        echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
-fi
-if [ -f "$DEACTIVATE_ENV" ]; then
-        echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
-else
-        mkdir -p ${PREFIX}/etc/conda/deactivate.d
-        touch ${PREFIX}/etc/conda/deactivate.d/${PKG_NAME}_deactivate.sh
-        echo '#!/bin/sh' >> $DEACTIVATE_ENV
-        echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
-fi
-
+# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
+# This will allow them to be run on environment activation.
+for CHANGE in "activate" "deactivate"
+do
+    mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
+    cp "${RECIPE_DIR}/scripts/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
+done
 # Hack to suppress building docs
 cat > doc/Makefile << EOF
 html :	
diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index edb5623e..08e894ea 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -1,2 +1,4 @@
 export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
-export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site:$JULIA_DEPOT_PATH"
\ No newline at end of file
+export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
+export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site:$JULIA_DEPOT_PATH"
+export JULIA_PROJECT="$CONDA_PREFIX/share/julia/site/environments/$CONDA_DEFAULT_ENV"
\ No newline at end of file
diff --git a/recipe/scripts/deactivate.sh b/recipe/scripts/deactivate.sh
index 3dd1e7fa..6067c2bb 100644
--- a/recipe/scripts/deactivate.sh
+++ b/recipe/scripts/deactivate.sh
@@ -1,6 +1,11 @@
 export JULIA_DEPOT_PATH=$JULIA_DEPOT_PATH_BACKUP
+export JULIA_PROJECT=$JULIA_PROJECT_BACKUP
 unset JULIA_DEPOT_PATH_BACKUP
+unset JULIA_PROJECT_BACKUP
 
 if [ -z $JULIA_DEPOT_PATH ]; then
     unset JULIA_DEPOT_PATH
 fi
+if [ -z $JULIA_PROJECT ]; then
+    unset JULIA_PROJECT
+fi

From ef38900323ab58f5c7301cb3658dd6e1d61845a6 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Fri, 24 Dec 2021 17:14:04 -0500
Subject: [PATCH 06/37] reorganize

---
 recipe/build.sh                       | 2 +-
 recipe/{ => old_unused}/juliarc.jl    | 0
 recipe/{ => old_unused}/pre-unlink.sh | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename recipe/{ => old_unused}/juliarc.jl (100%)
 rename recipe/{ => old_unused}/pre-unlink.sh (100%)

diff --git a/recipe/build.sh b/recipe/build.sh
index 6204b1dd..0fd2ee90 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -62,7 +62,7 @@ make -j${CPU_COUNT} prefix=${PREFIX} sysconfigdir=${PREFIX}/etc \
  USE_SYSTEM_ZLIB=1 \
  USE_SYSTEM_P7ZIP=1 \
  ${EXTRA_MAKEFLAGS} \
- TAGGED_RELEASE_BANNER="conda-forge-julia release" \
+ TAGGED_RELEASE_BANNER="conda-forge release" \
  CC=$CC CXX=$CXX FC=$FC \
  install
 
diff --git a/recipe/juliarc.jl b/recipe/old_unused/juliarc.jl
similarity index 100%
rename from recipe/juliarc.jl
rename to recipe/old_unused/juliarc.jl
diff --git a/recipe/pre-unlink.sh b/recipe/old_unused/pre-unlink.sh
similarity index 100%
rename from recipe/pre-unlink.sh
rename to recipe/old_unused/pre-unlink.sh

From 4d2bee0d9a033b918d750ac91390b6547ff6f855 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Fri, 24 Dec 2021 17:14:49 -0500
Subject: [PATCH 07/37] increase bld no

---
 recipe/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 68477954..f6954c19 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -24,7 +24,7 @@ source:
 
 build:
   skip: true  # [win]
-  number: 0
+  number: 1
   features:
 
 requirements:

From 1b1d1708c486cdb9d92f9ea2199c3621e5f4963f Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Fri, 24 Dec 2021 17:37:36 -0500
Subject: [PATCH 08/37] try building osx with system mbedtls

---
 recipe/build.sh  | 2 +-
 recipe/meta.yaml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index 0fd2ee90..aa89f5b0 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -20,7 +20,7 @@ make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC
 
 export EXTRA_MAKEFLAGS="" 
 if [[ "${target_platform}" == osx-* ]]; then
-    export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=0 USE_SYSTEM_MBEDTLS=0"
+    export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=0 USE_SYSTEM_MBEDTLS=1"
 elif [[ "${target_platform}" == linux-* ]]; then
     export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_MBEDTLS=1"
 fi
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index f6954c19..bbdfb59e 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -46,7 +46,8 @@ requirements:
     - libssh2
     - libosxunwind  # [osx]
     - libunwind  # [linux]
-    - mbedtls  # [not osx]
+    # - mbedtls  # [not osx]
+    - mbedtls
     - arpack
     - suitesparse
     - pcre2
@@ -69,7 +70,8 @@ requirements:
     - curl
     - libgit2  # [not osx]
     - libssh2
-    - mbedtls  # [not osx]
+    # - mbedtls  # [not osx]
+    - mbedtls
     - git
     - libutf8proc
     - libnghttp2

From 7ac5077ec1bd61b9836890752508377b26cd9ee5 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Fri, 24 Dec 2021 17:38:26 -0500
Subject: [PATCH 09/37] only apply three new patches to linux for now

---
 recipe/meta.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index bbdfb59e..c50921b2 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -15,12 +15,12 @@ source:
     - julia-hardcoded-libs.patch
     ## unreliable tests:
     ## see: https://github.com/JuliaLang/julia/issues/43004
-    - 0001-fixing-core.jl-tests.patch
+    - 0001-fixing-core.jl-tests.patch  # [linux]
     ## see: https://github.com/JuliaLang/julia/issues/43249#issuecomment-981147025
     ## and: https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.2.patch
-    - libgit2-patch.diff
+    - libgit2-patch.diff  # [linux]
     ## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
-    - 0002-Baz.baz-temporary-deletion.patch
+    - 0002-Baz.baz-temporary-deletion.patch  # [linux]
 
 build:
   skip: true  # [win]

From a4e2e2b96e3166b083c2e38031c9f03863a56215 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Fri, 24 Dec 2021 17:38:53 -0500
Subject: [PATCH 10/37] reorganize order of patches

---
 recipe/meta.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index c50921b2..6d378896 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -13,12 +13,12 @@ source:
   patches:
     ## from https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
     - julia-hardcoded-libs.patch
-    ## unreliable tests:
-    ## see: https://github.com/JuliaLang/julia/issues/43004
-    - 0001-fixing-core.jl-tests.patch  # [linux]
     ## see: https://github.com/JuliaLang/julia/issues/43249#issuecomment-981147025
     ## and: https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.2.patch
     - libgit2-patch.diff  # [linux]
+    ## unreliable tests:
+    ## see: https://github.com/JuliaLang/julia/issues/43004
+    - 0001-fixing-core.jl-tests.patch  # [linux]
     ## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
     - 0002-Baz.baz-temporary-deletion.patch  # [linux]
 

From 341c515e5866b7d002a8ff7d425b78839c1e1395 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Fri, 24 Dec 2021 17:58:21 -0500
Subject: [PATCH 11/37] Revert "try building osx with system mbedtls"

This reverts commit 1b1d1708c486cdb9d92f9ea2199c3621e5f4963f.
---
 recipe/build.sh  | 2 +-
 recipe/meta.yaml | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index aa89f5b0..0fd2ee90 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -20,7 +20,7 @@ make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC
 
 export EXTRA_MAKEFLAGS="" 
 if [[ "${target_platform}" == osx-* ]]; then
-    export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=0 USE_SYSTEM_MBEDTLS=1"
+    export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=0 USE_SYSTEM_MBEDTLS=0"
 elif [[ "${target_platform}" == linux-* ]]; then
     export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_MBEDTLS=1"
 fi
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 6d378896..1e39b476 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -46,8 +46,7 @@ requirements:
     - libssh2
     - libosxunwind  # [osx]
     - libunwind  # [linux]
-    # - mbedtls  # [not osx]
-    - mbedtls
+    - mbedtls  # [not osx]
     - arpack
     - suitesparse
     - pcre2
@@ -70,8 +69,7 @@ requirements:
     - curl
     - libgit2  # [not osx]
     - libssh2
-    # - mbedtls  # [not osx]
-    - mbedtls
+    - mbedtls  # [not osx]
     - git
     - libutf8proc
     - libnghttp2

From 3f5facf3d2cf76cc9d4d7e9e616448d9b38f4576 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Fri, 24 Dec 2021 18:46:06 -0500
Subject: [PATCH 12/37] comment out juliarc.jl

---
 recipe/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index 0fd2ee90..9f373f95 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -67,4 +67,4 @@ make -j${CPU_COUNT} prefix=${PREFIX} sysconfigdir=${PREFIX}/etc \
  install
 
 # Configure juliarc to use conda environment
-cat "${RECIPE_DIR}/juliarc.jl" >> "${PREFIX}/etc/julia/juliarc.jl"
+# cat "${RECIPE_DIR}/juliarc.jl" >> "${PREFIX}/etc/julia/juliarc.jl"

From 6bd9068c8eebfd38d3cde157fed77810f3ebab7a Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sat, 25 Dec 2021 13:35:18 -0500
Subject: [PATCH 13/37] Update build.sh

---
 recipe/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index 9f373f95..fdf4d37e 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -62,7 +62,7 @@ make -j${CPU_COUNT} prefix=${PREFIX} sysconfigdir=${PREFIX}/etc \
  USE_SYSTEM_ZLIB=1 \
  USE_SYSTEM_P7ZIP=1 \
  ${EXTRA_MAKEFLAGS} \
- TAGGED_RELEASE_BANNER="conda-forge release" \
+ TAGGED_RELEASE_BANNER="A conda-forge release: https://github.com/conda-forge/julia-feedstock" \
  CC=$CC CXX=$CXX FC=$FC \
  install
 

From 1b7052c283ced2f59aadb9373530c7ce22954b05 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sat, 25 Dec 2021 13:36:09 -0500
Subject: [PATCH 14/37] try runtests math for osx

---
 recipe/meta.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 1e39b476..3748526f 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -82,7 +82,8 @@ test:
       "rational", "bitarray", "copy", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "loading", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
       "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "cmdlineargs", "int", "interpreter", "checked", "bitset", "floatfuncs",
       "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download"])' # all except stdlib, add "opaque_closure", "filesystem" with 1.7
-    - julia -e 'Base.runtests(["math"])'  # [not osx] due to failure on math.jl:296, pre-haswell processor
+#     - julia -e 'Base.runtests(["math"])'  # [not osx] due to failure on math.jl:296, pre-haswell processor
+    - julia -e 'Base.runtests(["math"])'
     - julia -e 'import Pkg;Pkg.add("LibSSH2_jll")'
     - julia -e 'import Pkg;Pkg.add("Sundials")'
   requires:

From 5caa35177f5a5f875efba6833e02ee2c67fa8ea3 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sat, 25 Dec 2021 14:53:30 -0500
Subject: [PATCH 15/37] test "opaque_closure", "filesystem"

---
 recipe/meta.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 3748526f..3110a9d3 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -81,8 +81,7 @@ test:
     - julia -e 'Base.runtests(["subarray", "core", "compiler", "worlds", "keywordargs", "numbers", "subtype", "char", "strings", "triplequote", "unicode", "intrinsics", "dict", "hashing", "iobuffer", "staged", "offsetarray", "arrayops", "tuple", "reduce", "reducedim", "abstractarray", "intfuncs", "simdloop", "vecelement",
       "rational", "bitarray", "copy", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "loading", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
       "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "cmdlineargs", "int", "interpreter", "checked", "bitset", "floatfuncs",
-      "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download"])' # all except stdlib, add "opaque_closure", "filesystem" with 1.7
-#     - julia -e 'Base.runtests(["math"])'  # [not osx] due to failure on math.jl:296, pre-haswell processor
+      "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download", "opaque_closure", "filesystem"])' # all except stdlib
     - julia -e 'Base.runtests(["math"])'
     - julia -e 'import Pkg;Pkg.add("LibSSH2_jll")'
     - julia -e 'import Pkg;Pkg.add("Sundials")'

From c2fd0f995717de10237654036bf9f36320d3f762 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sat, 25 Dec 2021 16:24:23 -0500
Subject: [PATCH 16/37] go all in on testing

---
 recipe/meta.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 3110a9d3..8ce30036 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -78,11 +78,12 @@ requirements:
 
 test:
   commands:
-    - julia -e 'Base.runtests(["subarray", "core", "compiler", "worlds", "keywordargs", "numbers", "subtype", "char", "strings", "triplequote", "unicode", "intrinsics", "dict", "hashing", "iobuffer", "staged", "offsetarray", "arrayops", "tuple", "reduce", "reducedim", "abstractarray", "intfuncs", "simdloop", "vecelement",
-      "rational", "bitarray", "copy", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "loading", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
-      "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "cmdlineargs", "int", "interpreter", "checked", "bitset", "floatfuncs",
-      "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download", "opaque_closure", "filesystem"])' # all except stdlib
-    - julia -e 'Base.runtests(["math"])'
+    - julia -e 'Base.runtests(["all"])'  # go all in: https://docs.julialang.org/en/v1/stdlib/Test/
+#     - julia -e 'Base.runtests(["subarray", "core", "compiler", "worlds", "keywordargs", "numbers", "subtype", "char", "strings", "triplequote", "unicode", "intrinsics", "dict", "hashing", "iobuffer", "staged", "offsetarray", "arrayops", "tuple", "reduce", "reducedim", "abstractarray", "intfuncs", "simdloop", "vecelement",
+#       "rational", "bitarray", "copy", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "loading", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
+#       "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "cmdlineargs", "int", "interpreter", "checked", "bitset", "floatfuncs",
+#       "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download", "opaque_closure", "filesystem"])' # all except stdlib
+#     - julia -e 'Base.runtests(["math"])'
     - julia -e 'import Pkg;Pkg.add("LibSSH2_jll")'
     - julia -e 'import Pkg;Pkg.add("Sundials")'
   requires:

From 35d13f613003206cc73fa7e40724aac9bfa8986e Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sat, 25 Dec 2021 18:21:56 -0500
Subject: [PATCH 17/37] revert previous; parallelize + add "math" to list

- use all processors: ncores=ceil(Int, Sys.CPU_THREADS
- move math up to regular tests (no longer necessary to stop it from running on osx)
---
 recipe/meta.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 8ce30036..4089b4d0 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -78,12 +78,10 @@ requirements:
 
 test:
   commands:
-    - julia -e 'Base.runtests(["all"])'  # go all in: https://docs.julialang.org/en/v1/stdlib/Test/
-#     - julia -e 'Base.runtests(["subarray", "core", "compiler", "worlds", "keywordargs", "numbers", "subtype", "char", "strings", "triplequote", "unicode", "intrinsics", "dict", "hashing", "iobuffer", "staged", "offsetarray", "arrayops", "tuple", "reduce", "reducedim", "abstractarray", "intfuncs", "simdloop", "vecelement",
-#       "rational", "bitarray", "copy", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "loading", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
-#       "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "cmdlineargs", "int", "interpreter", "checked", "bitset", "floatfuncs",
-#       "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download", "opaque_closure", "filesystem"])' # all except stdlib
-#     - julia -e 'Base.runtests(["math"])'
+    - julia -e 'Base.runtests(["subarray", "core", "compiler", "worlds", "keywordargs", "numbers", "subtype", "char", "strings", "triplequote", "unicode", "intrinsics", "dict", "hashing", "iobuffer", "staged", "offsetarray", "arrayops", "tuple", "reduce", "reducedim", "abstractarray", "intfuncs", "simdloop", "vecelement",
+      "rational", "bitarray", "copy", "math", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "loading", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
+      "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "cmdlineargs", "int", "interpreter", "checked", "bitset", "floatfuncs",
+      "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download", "opaque_closure", "filesystem"]; ncores=ceil(Int, Sys.CPU_THREADS))'  # all except stdlib?
     - julia -e 'import Pkg;Pkg.add("LibSSH2_jll")'
     - julia -e 'import Pkg;Pkg.add("Sundials")'
   requires:

From 9883823ee0f38362c2e54f8abca7b1c85ea378db Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:16:24 -0500
Subject: [PATCH 18/37] Update build.sh

---
 recipe/build.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index 654f3543..afefce8d 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -9,13 +9,6 @@ export PATH="${PREFIX}/bin:${PATH}"
 #set JULIA_DEPOT_PATH in conda env
 export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site:$JULIA_DEPOT_PATH" 
 
-# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
-# This will allow them to be run on environment activation.
-for CHANGE in "activate" "deactivate"
-do
-    mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
-    cp "${RECIPE_DIR}/scripts/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
-done
 # Hack to suppress building docs
 cat > doc/Makefile << EOF
 html :	
@@ -78,3 +71,11 @@ make -j${CPU_COUNT} prefix=${PREFIX} sysconfigdir=${PREFIX}/etc \
 
 # Configure juliarc to use conda environment
 # cat "${RECIPE_DIR}/juliarc.jl" >> "${PREFIX}/etc/julia/juliarc.jl"
+
+# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
+# This will allow them to be run on environment activation.
+for CHANGE in "activate" "deactivate"
+do
+    mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
+    cp "${RECIPE_DIR}/scripts/${CHANGE}.sh" "${PREFIX}/etc/conda/${CHANGE}.d/${PKG_NAME}_${CHANGE}.sh"
+done

From fe2b9c9e7c6ab9836fc34ccaadd6c97d13558fa6 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sun, 26 Dec 2021 17:17:08 -0500
Subject: [PATCH 19/37] Update activate.sh

---
 recipe/scripts/activate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index 08e894ea..64c3f514 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -1,4 +1,4 @@
 export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
 export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
-export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site:$JULIA_DEPOT_PATH"
-export JULIA_PROJECT="$CONDA_PREFIX/share/julia/site/environments/$CONDA_DEFAULT_ENV"
\ No newline at end of file
+export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site"
+export JULIA_PROJECT="$CONDA_PREFIX/share/julia/site/environments/$CONDA_DEFAULT_ENV"

From 700f956add8d9b152f59abcf752f0d1c9c6df918 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sun, 26 Dec 2021 18:11:02 -0500
Subject: [PATCH 20/37] Revert "Update activate.sh"

This reverts commit fe2b9c9e7c6ab9836fc34ccaadd6c97d13558fa6.
---
 recipe/scripts/activate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index 64c3f514..08e894ea 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -1,4 +1,4 @@
 export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
 export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
-export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site"
-export JULIA_PROJECT="$CONDA_PREFIX/share/julia/site/environments/$CONDA_DEFAULT_ENV"
+export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site:$JULIA_DEPOT_PATH"
+export JULIA_PROJECT="$CONDA_PREFIX/share/julia/site/environments/$CONDA_DEFAULT_ENV"
\ No newline at end of file

From 094df2268c1726673f489a84d4967eca0be04bf1 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sun, 26 Dec 2021 20:42:07 -0500
Subject: [PATCH 21/37] new patches

---
 ...-disable-testing-Vararg-Int-N-where.patch} |  6 ++---
 ...h => 0002-disable-testing-Baz.baz-1.patch} |  8 +++---
 ...rrectly-point-in-projectname-project.patch | 25 +++++++++++++++++++
 recipe/scripts/activate.sh                    |  3 +--
 4 files changed, 33 insertions(+), 9 deletions(-)
 rename recipe/{0001-fixing-core.jl-tests.patch => 0001-disable-testing-Vararg-Int-N-where.patch} (83%)
 rename recipe/{0002-Baz.baz-temporary-deletion.patch => 0002-disable-testing-Baz.baz-1.patch} (78%)
 create mode 100644 recipe/0003-correctly-point-in-projectname-project.patch

diff --git a/recipe/0001-fixing-core.jl-tests.patch b/recipe/0001-disable-testing-Vararg-Int-N-where.patch
similarity index 83%
rename from recipe/0001-fixing-core.jl-tests.patch
rename to recipe/0001-disable-testing-Vararg-Int-N-where.patch
index c67f0c05..ebb75048 100644
--- a/recipe/0001-fixing-core.jl-tests.patch
+++ b/recipe/0001-disable-testing-Vararg-Int-N-where.patch
@@ -1,7 +1,7 @@
-From f4a8c1310b8bb36d6669cb5f3c7f3c001835dceb Mon Sep 17 00:00:00 2001
+From 7d9a74a0eb59e62d9d64dbbe274184549fbbc752 Mon Sep 17 00:00:00 2001
 From: ngam <67342040+ngam@users.noreply.github.com>
-Date: Thu, 23 Dec 2021 14:22:34 -0500
-Subject: [PATCH] fixing core.jl tests
+Date: Mon, 27 Dec 2021 01:36:02 +0000
+Subject: [PATCH 1/3] disable testing Vararg{Int, N} where
 
 ---
  test/core.jl | 6 +++---
diff --git a/recipe/0002-Baz.baz-temporary-deletion.patch b/recipe/0002-disable-testing-Baz.baz-1.patch
similarity index 78%
rename from recipe/0002-Baz.baz-temporary-deletion.patch
rename to recipe/0002-disable-testing-Baz.baz-1.patch
index 129713e2..0a846b69 100644
--- a/recipe/0002-Baz.baz-temporary-deletion.patch
+++ b/recipe/0002-disable-testing-Baz.baz-1.patch
@@ -1,7 +1,7 @@
-From 023b3288cf3dfabab98eabca278e2c2d8634a23c Mon Sep 17 00:00:00 2001
+From 31e9de0137db669f1a41e933da701b0e2c7ea6f2 Mon Sep 17 00:00:00 2001
 From: ngam <67342040+ngam@users.noreply.github.com>
-Date: Thu, 23 Dec 2021 17:34:26 -0500
-Subject: [PATCH 2/2] Baz.baz temporary deletion
+Date: Mon, 27 Dec 2021 01:36:51 +0000
+Subject: [PATCH 2/3] disable testing Baz.baz == 1
 
 ---
  test/precompile.jl | 2 +-
@@ -21,5 +21,5 @@ index 51b25b8325..8abd491a63 100644
      # Issue #12720
      FooBar1_file = joinpath(dir, "FooBar1.jl")
 -- 
-2.32.0 (Apple Git-132)
+2.34.1
 
diff --git a/recipe/0003-correctly-point-in-projectname-project.patch b/recipe/0003-correctly-point-in-projectname-project.patch
new file mode 100644
index 00000000..7bbf84e1
--- /dev/null
+++ b/recipe/0003-correctly-point-in-projectname-project.patch
@@ -0,0 +1,25 @@
+From 67f620177ee9f321cd62b9e86114439761542dcb Mon Sep 17 00:00:00 2001
+From: ngam <67342040+ngam@users.noreply.github.com>
+Date: Mon, 27 Dec 2021 01:37:48 +0000
+Subject: [PATCH 3/3] correctly point in @projectname --project
+
+---
+ test/cmdlineargs.jl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
+index fb206acf03..3d1efdd0d2 100644
+--- a/test/cmdlineargs.jl
++++ b/test/cmdlineargs.jl
+@@ -112,7 +112,7 @@ let exename = `$(Base.julia_cmd()) --startup-file=no --color=no`
+     if !Sys.iswindows()
+         let expanded = abspath(expanduser("~/foo/Project.toml"))
+             @test expanded == readchomp(`$exename --project='~/foo' -e 'println(Base.active_project())'`)
+-            @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "~/foo", "HOME" => homedir()))
++            @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir(), "JULIA_DEPOT_PATH" => ENV["JULIA_DEPOT_PATH"]))
+         end
+     end
+ 
+-- 
+2.34.1
+
diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index 08e894ea..d85ac9d5 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -1,4 +1,3 @@
 export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
 export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
-export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia/site:$JULIA_DEPOT_PATH"
-export JULIA_PROJECT="$CONDA_PREFIX/share/julia/site/environments/$CONDA_DEFAULT_ENV"
\ No newline at end of file
+export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia:$JULIA_DEPOT_PATH"

From 7bac8743fb24185191335fd3424d472c382f1161 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sun, 26 Dec 2021 20:51:51 -0500
Subject: [PATCH 22/37] correct patches in meta

---
 recipe/meta.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 4089b4d0..ddb2962d 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -18,9 +18,11 @@ source:
     - libgit2-patch.diff  # [linux]
     ## unreliable tests:
     ## see: https://github.com/JuliaLang/julia/issues/43004
-    - 0001-fixing-core.jl-tests.patch  # [linux]
+    - 0001-disable-testing-Vararg-Int-N-where.patch  # [linux]
     ## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
-    - 0002-Baz.baz-temporary-deletion.patch  # [linux]
+    - 0002-disable-testing-Baz.baz-1.patch  # [linux]
+    ## see PR upstream: https://github.com/JuliaLang/julia/pull/43560
+    - 0003-correctly-point-in-projectname-project.patch
 
 build:
   skip: true  # [win]

From 1d0a2c5a61321218927dd191e926544d93ec7d66 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sun, 26 Dec 2021 21:48:57 -0500
Subject: [PATCH 23/37] change of patches

---
 ...1-disable-testing-Vararg-Int-N-where.patch |  4 +--
 recipe/0002-disable-testing-Baz.baz-1.patch   |  4 +--
 ...rrectly-point-in-projectname-project.patch |  4 +--
 .../0004-another-occurence-of-pointing.patch  | 25 +++++++++++++++++++
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 recipe/0004-another-occurence-of-pointing.patch

diff --git a/recipe/0001-disable-testing-Vararg-Int-N-where.patch b/recipe/0001-disable-testing-Vararg-Int-N-where.patch
index ebb75048..e2a5a09e 100644
--- a/recipe/0001-disable-testing-Vararg-Int-N-where.patch
+++ b/recipe/0001-disable-testing-Vararg-Int-N-where.patch
@@ -1,7 +1,7 @@
 From 7d9a74a0eb59e62d9d64dbbe274184549fbbc752 Mon Sep 17 00:00:00 2001
-From: ngam <67342040+ngam@users.noreply.github.com>
+From: ngam <ngam@users.noreply.github.com>
 Date: Mon, 27 Dec 2021 01:36:02 +0000
-Subject: [PATCH 1/3] disable testing Vararg{Int, N} where
+Subject: [PATCH 1/4] disable testing Vararg{Int, N} where
 
 ---
  test/core.jl | 6 +++---
diff --git a/recipe/0002-disable-testing-Baz.baz-1.patch b/recipe/0002-disable-testing-Baz.baz-1.patch
index 0a846b69..ae96fc28 100644
--- a/recipe/0002-disable-testing-Baz.baz-1.patch
+++ b/recipe/0002-disable-testing-Baz.baz-1.patch
@@ -1,7 +1,7 @@
 From 31e9de0137db669f1a41e933da701b0e2c7ea6f2 Mon Sep 17 00:00:00 2001
-From: ngam <67342040+ngam@users.noreply.github.com>
+From: ngam <ngam@users.noreply.github.com>
 Date: Mon, 27 Dec 2021 01:36:51 +0000
-Subject: [PATCH 2/3] disable testing Baz.baz == 1
+Subject: [PATCH 2/4] disable testing Baz.baz == 1
 
 ---
  test/precompile.jl | 2 +-
diff --git a/recipe/0003-correctly-point-in-projectname-project.patch b/recipe/0003-correctly-point-in-projectname-project.patch
index 7bbf84e1..d083fa57 100644
--- a/recipe/0003-correctly-point-in-projectname-project.patch
+++ b/recipe/0003-correctly-point-in-projectname-project.patch
@@ -1,7 +1,7 @@
 From 67f620177ee9f321cd62b9e86114439761542dcb Mon Sep 17 00:00:00 2001
-From: ngam <67342040+ngam@users.noreply.github.com>
+From: ngam <ngam@users.noreply.github.com>
 Date: Mon, 27 Dec 2021 01:37:48 +0000
-Subject: [PATCH 3/3] correctly point in @projectname --project
+Subject: [PATCH 3/4] correctly point in @projectname --project
 
 ---
  test/cmdlineargs.jl | 2 +-
diff --git a/recipe/0004-another-occurence-of-pointing.patch b/recipe/0004-another-occurence-of-pointing.patch
new file mode 100644
index 00000000..97ef7394
--- /dev/null
+++ b/recipe/0004-another-occurence-of-pointing.patch
@@ -0,0 +1,25 @@
+From e4f0e7c7f750dc0f27fd59c1fe7cd8d70dbd2fc9 Mon Sep 17 00:00:00 2001
+From: ngam <67342040+ngam@users.noreply.github.com>
+Date: Sun, 26 Dec 2021 21:45:50 -0500
+Subject: [PATCH 4/4] another occurence of pointing
+
+---
+ test/cmdlineargs.jl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
+index 3d1efdd0d2..7fb7e5ad9e 100644
+--- a/test/cmdlineargs.jl
++++ b/test/cmdlineargs.jl
+@@ -119,7 +119,7 @@ let exename = `$(Base.julia_cmd()) --startup-file=no --color=no`
+     # handling of @projectname in --project and JULIA_PROJECT
+     let expanded = abspath(Base.load_path_expand("@foo"))
+         @test expanded == readchomp(`$exename --project='@foo' -e 'println(Base.active_project())'`)
+-        @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir()))
++        @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir(), "JULIA_DEPOT_PATH" => ENV["JULIA_DEPOT_PATH"]))
+     end
+ 
+     # --quiet, --banner
+-- 
+2.34.1
+

From 43290dd051d63a5732ae22e29e97486ffdf215c1 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Sun, 26 Dec 2021 22:26:59 -0500
Subject: [PATCH 24/37] Update meta.yaml

---
 recipe/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index ddb2962d..ac1a38d2 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -22,7 +22,7 @@ source:
     ## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
     - 0002-disable-testing-Baz.baz-1.patch  # [linux]
     ## see PR upstream: https://github.com/JuliaLang/julia/pull/43560
-    - 0003-correctly-point-in-projectname-project.patch
+    - 0004-another-occurence-of-pointing.patch
 
 build:
   skip: true  # [win]

From 480090b0b7a13b8af9455b9ef42570f6e0a291c7 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <markkitt@gmail.com>
Date: Mon, 27 Dec 2021 03:35:22 -0500
Subject: [PATCH 25/37] Modify patch to match upstream JuliaLang/julia#42358.
 Use addenv.

---
 ...1-disable-testing-Vararg-Int-N-where.patch |  2 +-
 recipe/0002-disable-testing-Baz.baz-1.patch   |  2 +-
 ...3-correct-test-for-julia-depot-path.patch} |  4 +--
 ...rrectly-point-in-projectname-project.patch | 25 -------------------
 recipe/meta.yaml                              |  4 +--
 5 files changed, 6 insertions(+), 31 deletions(-)
 rename recipe/{0004-another-occurence-of-pointing.patch => 0003-correct-test-for-julia-depot-path.patch} (84%)
 delete mode 100644 recipe/0003-correctly-point-in-projectname-project.patch

diff --git a/recipe/0001-disable-testing-Vararg-Int-N-where.patch b/recipe/0001-disable-testing-Vararg-Int-N-where.patch
index e2a5a09e..9978fd63 100644
--- a/recipe/0001-disable-testing-Vararg-Int-N-where.patch
+++ b/recipe/0001-disable-testing-Vararg-Int-N-where.patch
@@ -1,7 +1,7 @@
 From 7d9a74a0eb59e62d9d64dbbe274184549fbbc752 Mon Sep 17 00:00:00 2001
 From: ngam <ngam@users.noreply.github.com>
 Date: Mon, 27 Dec 2021 01:36:02 +0000
-Subject: [PATCH 1/4] disable testing Vararg{Int, N} where
+Subject: [PATCH 1/3] disable testing Vararg{Int, N} where
 
 ---
  test/core.jl | 6 +++---
diff --git a/recipe/0002-disable-testing-Baz.baz-1.patch b/recipe/0002-disable-testing-Baz.baz-1.patch
index ae96fc28..4c5fa2ee 100644
--- a/recipe/0002-disable-testing-Baz.baz-1.patch
+++ b/recipe/0002-disable-testing-Baz.baz-1.patch
@@ -1,7 +1,7 @@
 From 31e9de0137db669f1a41e933da701b0e2c7ea6f2 Mon Sep 17 00:00:00 2001
 From: ngam <ngam@users.noreply.github.com>
 Date: Mon, 27 Dec 2021 01:36:51 +0000
-Subject: [PATCH 2/4] disable testing Baz.baz == 1
+Subject: [PATCH 2/3] disable testing Baz.baz == 1
 
 ---
  test/precompile.jl | 2 +-
diff --git a/recipe/0004-another-occurence-of-pointing.patch b/recipe/0003-correct-test-for-julia-depot-path.patch
similarity index 84%
rename from recipe/0004-another-occurence-of-pointing.patch
rename to recipe/0003-correct-test-for-julia-depot-path.patch
index 97ef7394..cd20d6c3 100644
--- a/recipe/0004-another-occurence-of-pointing.patch
+++ b/recipe/0003-correct-test-for-julia-depot-path.patch
@@ -1,7 +1,7 @@
 From e4f0e7c7f750dc0f27fd59c1fe7cd8d70dbd2fc9 Mon Sep 17 00:00:00 2001
 From: ngam <67342040+ngam@users.noreply.github.com>
 Date: Sun, 26 Dec 2021 21:45:50 -0500
-Subject: [PATCH 4/4] another occurence of pointing
+Subject: [PATCH 3/3] Correct test for JULIA_DEPOT_PATH, See JuliaLang/julia#42358
 
 ---
  test/cmdlineargs.jl | 2 +-
@@ -16,7 +16,7 @@ index 3d1efdd0d2..7fb7e5ad9e 100644
      let expanded = abspath(Base.load_path_expand("@foo"))
          @test expanded == readchomp(`$exename --project='@foo' -e 'println(Base.active_project())'`)
 -        @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir()))
-+        @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir(), "JULIA_DEPOT_PATH" => ENV["JULIA_DEPOT_PATH"]))
++        @test expanded == readchomp(addenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir()))
      end
  
      # --quiet, --banner
diff --git a/recipe/0003-correctly-point-in-projectname-project.patch b/recipe/0003-correctly-point-in-projectname-project.patch
deleted file mode 100644
index d083fa57..00000000
--- a/recipe/0003-correctly-point-in-projectname-project.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 67f620177ee9f321cd62b9e86114439761542dcb Mon Sep 17 00:00:00 2001
-From: ngam <ngam@users.noreply.github.com>
-Date: Mon, 27 Dec 2021 01:37:48 +0000
-Subject: [PATCH 3/4] correctly point in @projectname --project
-
----
- test/cmdlineargs.jl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
-index fb206acf03..3d1efdd0d2 100644
---- a/test/cmdlineargs.jl
-+++ b/test/cmdlineargs.jl
-@@ -112,7 +112,7 @@ let exename = `$(Base.julia_cmd()) --startup-file=no --color=no`
-     if !Sys.iswindows()
-         let expanded = abspath(expanduser("~/foo/Project.toml"))
-             @test expanded == readchomp(`$exename --project='~/foo' -e 'println(Base.active_project())'`)
--            @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "~/foo", "HOME" => homedir()))
-+            @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir(), "JULIA_DEPOT_PATH" => ENV["JULIA_DEPOT_PATH"]))
-         end
-     end
- 
--- 
-2.34.1
-
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index ac1a38d2..cfccfa92 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -21,8 +21,8 @@ source:
     - 0001-disable-testing-Vararg-Int-N-where.patch  # [linux]
     ## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
     - 0002-disable-testing-Baz.baz-1.patch  # [linux]
-    ## see PR upstream: https://github.com/JuliaLang/julia/pull/43560
-    - 0004-another-occurence-of-pointing.patch
+    ## see PR upstream: https://github.com/JuliaLang/julia/pull/42358
+    - 0003-correct-test-for-julia-depot-path.patch
 
 build:
   skip: true  # [win]

From 1e312a12bc4722885fcd896488bca53b2cedc838 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <markkitt@gmail.com>
Date: Mon, 27 Dec 2021 03:50:20 -0500
Subject: [PATCH 26/37] Re-add JULIA_PROJECT to be "@$CONDA_DEFAULT_ENV"

---
 recipe/scripts/activate.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index d85ac9d5..3033eee4 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -1,3 +1,6 @@
 export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
 export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
 export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia:$JULIA_DEPOT_PATH"
+# Use of @ to specify a shared named environment is new as of Julia 1.7
+# https://github.com/JuliaLang/julia/pull/40025
+export JULIA_PROJECT="@$CONDA_DEFAULT_ENV"

From 0682a5fdac791eb2286f932b11fbfbe1477d87c8 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Mon, 27 Dec 2021 08:49:16 -0500
Subject: [PATCH 27/37] Revert "Re-add JULIA_PROJECT to be
 "@$CONDA_DEFAULT_ENV""

This reverts commit 1e312a12bc4722885fcd896488bca53b2cedc838.
---
 recipe/scripts/activate.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index 3033eee4..d85ac9d5 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -1,6 +1,3 @@
 export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
 export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
 export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia:$JULIA_DEPOT_PATH"
-# Use of @ to specify a shared named environment is new as of Julia 1.7
-# https://github.com/JuliaLang/julia/pull/40025
-export JULIA_PROJECT="@$CONDA_DEFAULT_ENV"

From 3bff446bb37d832913cbdc90126d4f7c22956164 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <markkitt@gmail.com>
Date: Mon, 27 Dec 2021 20:45:21 -0500
Subject: [PATCH 28/37] Set JULIA_PROJECT and JULIA_LOAD_PATH according to
 conda environment

---
 recipe/scripts/activate.sh   | 10 ++++++++++
 recipe/scripts/deactivate.sh |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index d85ac9d5..31d2a279 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -1,3 +1,13 @@
 export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
 export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
+export JULIA_LOAD_PATH_BACKUP=${JULIA_LOAD_PATH:-}
+
+# Move ~/.julia to a conda environment specific location
 export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia:$JULIA_DEPOT_PATH"
+
+# Create a unique shared named environment for each conda environment
+# Use of @ to specify a shared named environment is new as of Julia 1.7
+# https://github.com/JuliaLang/julia/pull/40025
+export JULIA_PROJECT="@$CONDA_DEFAULT_ENV"
+# Modify load path so that projects stack on the unique shared named environment
+export JULIA_LOAD_PATH="@:$JULIA_PROJECT:@stdlib"
diff --git a/recipe/scripts/deactivate.sh b/recipe/scripts/deactivate.sh
index 6067c2bb..bd578e4f 100644
--- a/recipe/scripts/deactivate.sh
+++ b/recipe/scripts/deactivate.sh
@@ -1,7 +1,10 @@
 export JULIA_DEPOT_PATH=$JULIA_DEPOT_PATH_BACKUP
 export JULIA_PROJECT=$JULIA_PROJECT_BACKUP
+export JULIA_LOAD_PATH=$JULIA_LOAD_PATH_BACKUP
+
 unset JULIA_DEPOT_PATH_BACKUP
 unset JULIA_PROJECT_BACKUP
+unset JULIA_LOAD_PATH_BACKUP
 
 if [ -z $JULIA_DEPOT_PATH ]; then
     unset JULIA_DEPOT_PATH
@@ -9,3 +12,6 @@ fi
 if [ -z $JULIA_PROJECT ]; then
     unset JULIA_PROJECT
 fi
+if [ -z $JULIA_LOAD_PATH ]; then
+    unset JULIA_LOAD_PATH
+fi

From d6bdcf6d1689eb8fc68c77d2b6fc5f73adb03de0 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <markkitt@gmail.com>
Date: Mon, 27 Dec 2021 20:45:45 -0500
Subject: [PATCH 29/37] Test loading and cmdlineargs with default JULIA_PROJECT

---
 recipe/meta.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index cfccfa92..c57a7697 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -81,9 +81,10 @@ requirements:
 test:
   commands:
     - julia -e 'Base.runtests(["subarray", "core", "compiler", "worlds", "keywordargs", "numbers", "subtype", "char", "strings", "triplequote", "unicode", "intrinsics", "dict", "hashing", "iobuffer", "staged", "offsetarray", "arrayops", "tuple", "reduce", "reducedim", "abstractarray", "intfuncs", "simdloop", "vecelement",
-      "rational", "bitarray", "copy", "math", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "loading", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
-      "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "cmdlineargs", "int", "interpreter", "checked", "bitset", "floatfuncs",
+      "rational", "bitarray", "copy", "math", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
+      "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "int", "interpreter", "checked", "bitset", "floatfuncs",
       "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download", "opaque_closure", "filesystem"]; ncores=ceil(Int, Sys.CPU_THREADS))'  # all except stdlib?
+    - julia --project -e 'delete!(ENV, "JULIA_PROJECT"); Base.runtests(["loading", "cmdlineargs"])' # Julia 1.7.1 tests error here when a project is defined
     - julia -e 'import Pkg;Pkg.add("LibSSH2_jll")'
     - julia -e 'import Pkg;Pkg.add("Sundials")'
   requires:

From 03f4681eca04f17863b442d3e99526f1eb41e758 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <markkitt@gmail.com>
Date: Mon, 27 Dec 2021 23:51:53 -0500
Subject: [PATCH 30/37] Extract env name as last directory of CONDA_PREFIX

---
 recipe/scripts/activate.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index 31d2a279..334920e8 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -8,6 +8,7 @@ export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia:$JULIA_DEPOT_PATH"
 # Create a unique shared named environment for each conda environment
 # Use of @ to specify a shared named environment is new as of Julia 1.7
 # https://github.com/JuliaLang/julia/pull/40025
-export JULIA_PROJECT="@$CONDA_DEFAULT_ENV"
+# The name of the environment is the last directory of the CONDA_PREFIX
+export JULIA_PROJECT="@${CONDA_PREFIX##*/}"
 # Modify load path so that projects stack on the unique shared named environment
 export JULIA_LOAD_PATH="@:$JULIA_PROJECT:@stdlib"

From 5c13e8111173d7111ddbd03fc31e8d0e5b6430d8 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <markkitt@gmail.com>
Date: Tue, 28 Dec 2021 00:09:07 -0500
Subject: [PATCH 31/37] Remove JULIA_LOAD_PATH while testing loading

---
 recipe/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index c57a7697..e317c9fc 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -84,7 +84,7 @@ test:
       "rational", "bitarray", "copy", "math", "fastmath", "functional", "iterators", "operators", "ordering", "path", "ccall", "parse", "gmp", "sorting", "spawn", "backtrace", "exceptions", "file", "read", "version", "namedtuple", "mpfr", "broadcast", "complex", "floatapprox", "reflection", "regex", "float16", "combinatorics",
       "sysinfo", "env", "rounding", "ranges", "mod2pi", "euler", "show", "client", "errorshow", "sets", "goto", "llvmcall", "llvmcall2", "ryu", "some", "meta", "stacktraces", "docs", "misc", "threads", "stress", "binaryplatforms", "atexit", "enums", "int", "interpreter", "checked", "bitset", "floatfuncs",
       "precompile", "boundscheck", "error", "ambiguous", "cartesian", "osutils", "channels", "iostream", "secretbuffer", "specificity", "reinterpretarray", "syntax", "corelogging", "missing", "asyncmap", "smallarrayshrink", "download", "opaque_closure", "filesystem"]; ncores=ceil(Int, Sys.CPU_THREADS))'  # all except stdlib?
-    - julia --project -e 'delete!(ENV, "JULIA_PROJECT"); Base.runtests(["loading", "cmdlineargs"])' # Julia 1.7.1 tests error here when a project is defined
+    - julia --project -e 'delete!(ENV, "JULIA_PROJECT"); delete!(ENV, "JULIA_LOAD_PATH"); Base.runtests(["loading", "cmdlineargs"])' # Julia 1.7.1 tests error here when a project is defined
     - julia -e 'import Pkg;Pkg.add("LibSSH2_jll")'
     - julia -e 'import Pkg;Pkg.add("Sundials")'
   requires:

From 8f865a2a46bee95645443671c07aeeae6c54508a Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Tue, 28 Dec 2021 22:54:52 -0500
Subject: [PATCH 32/37] Update build.sh

---
 recipe/build.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/recipe/build.sh b/recipe/build.sh
index afefce8d..5a62a1a0 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -6,9 +6,6 @@ export LIBRARY_PATH=${PREFIX}/lib
 export CMAKE_PREFIX_PATH=${PREFIX}
 export PATH="${PREFIX}/bin:${PATH}"
 
-#set JULIA_DEPOT_PATH in conda env
-export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site:$JULIA_DEPOT_PATH" 
-
 # Hack to suppress building docs
 cat > doc/Makefile << EOF
 html :	
@@ -69,9 +66,6 @@ make -j${CPU_COUNT} prefix=${PREFIX} sysconfigdir=${PREFIX}/etc \
  CC=$CC CXX=$CXX FC=$FC \
  install
 
-# Configure juliarc to use conda environment
-# cat "${RECIPE_DIR}/juliarc.jl" >> "${PREFIX}/etc/julia/juliarc.jl"
-
 # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
 # This will allow them to be run on environment activation.
 for CHANGE in "activate" "deactivate"

From 1b25ed1cb6dc9f19927a2810e72e038c58624393 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Tue, 28 Dec 2021 22:55:01 -0500
Subject: [PATCH 33/37] Delete recipe/old_unused directory

---
 recipe/old_unused/juliarc.jl    | 6 ------
 recipe/old_unused/pre-unlink.sh | 1 -
 2 files changed, 7 deletions(-)
 delete mode 100644 recipe/old_unused/juliarc.jl
 delete mode 100644 recipe/old_unused/pre-unlink.sh

diff --git a/recipe/old_unused/juliarc.jl b/recipe/old_unused/juliarc.jl
deleted file mode 100644
index 544d7d45..00000000
--- a/recipe/old_unused/juliarc.jl
+++ /dev/null
@@ -1,6 +0,0 @@
-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], ".")))
-end
diff --git a/recipe/old_unused/pre-unlink.sh b/recipe/old_unused/pre-unlink.sh
deleted file mode 100644
index 6363aff5..00000000
--- a/recipe/old_unused/pre-unlink.sh
+++ /dev/null
@@ -1 +0,0 @@
-"${PREFIX}/bin/julia" -e 'rm(ENV["JULIA_PKGDIR"], recursive=true)' >> "${PREFIX}/.messages.txt" 2>&1

From ca159c6aa662ad7dff1f5fc112c99d8d35320c67 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Tue, 28 Dec 2021 22:56:46 -0500
Subject: [PATCH 34/37] reorganize patches and delete unnecessary files

---
 recipe/.DS_Store                                 | Bin 0 -> 6148 bytes
 recipe/meta.yaml                                 |  10 +++++-----
 recipe/{ => patches}/julia-hardcoded-libs.patch  |   0
 recipe/{ => patches}/libgit2-patch.diff          |   0
 ...0001-disable-testing-Vararg-Int-N-where.patch |   0
 .../0002-disable-testing-Baz.baz-1.patch         |   0
 .../0003-correct-test-for-julia-depot-path.patch |   0
 7 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 recipe/.DS_Store
 rename recipe/{ => patches}/julia-hardcoded-libs.patch (100%)
 rename recipe/{ => patches}/libgit2-patch.diff (100%)
 rename recipe/{ => scripts}/0001-disable-testing-Vararg-Int-N-where.patch (100%)
 rename recipe/{ => scripts}/0002-disable-testing-Baz.baz-1.patch (100%)
 rename recipe/{ => scripts}/0003-correct-test-for-julia-depot-path.patch (100%)

diff --git a/recipe/.DS_Store b/recipe/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3923bd9ab96b467cbbf5d227df1ed2eb5bd5aa36
GIT binary patch
literal 6148
zcmeHKOHRWu5S@Wa1hMIorLWK%m@1s07l5{iE*d2gun!kw!#!ZbL3qzIpoC_@0wIKE
zB>Rm$A3INq?GX`OK5Q2va}lY~h)QKbI6Y}Pa_1RPOOBn~$ld;SvD&l~iT>gg_kJRs
zT+6*|WU&9H8*KNBN7L5zdf%?$QN6rAzMVcjUmWIX+U+;Ix*gdXtu|OV)L<YO2nK?I
zVBp6Yz@1I0&J3du27-ZL;FAHK4+)K!9ecxabf7CG0Fck<BG6e&FeW)>$KDVYh*~Jn
zLe)zQwQ$TQ_sfpGp@oZj@u9x*NAaR%b>vUQT{Ig;9}ENoV+M|GIOqL;iC<>2$RCHq
zC>RI^{uu*0t5@|BALV!J!RPU=O=wqW6#Dg4AkasT01SAJoEM|n6Lt7y$KH@xIA6kn
O@enA4L>CPF0t4@^TrZvg

literal 0
HcmV?d00001

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index cfccfa92..1b094c5e 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -12,17 +12,17 @@ source:
   sha256: {{ sha256 }}
   patches:
     ## from https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
-    - julia-hardcoded-libs.patch
+    - patches/julia-hardcoded-libs.patch
     ## see: https://github.com/JuliaLang/julia/issues/43249#issuecomment-981147025
     ## and: https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.2.patch
-    - libgit2-patch.diff  # [linux]
+    - patches/libgit2-patch.diff  # [linux]
     ## unreliable tests:
     ## see: https://github.com/JuliaLang/julia/issues/43004
-    - 0001-disable-testing-Vararg-Int-N-where.patch  # [linux]
+    - patches/0001-disable-testing-Vararg-Int-N-where.patch  # [linux]
     ## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
-    - 0002-disable-testing-Baz.baz-1.patch  # [linux]
+    - patches/0002-disable-testing-Baz.baz-1.patch  # [linux]
     ## see PR upstream: https://github.com/JuliaLang/julia/pull/42358
-    - 0003-correct-test-for-julia-depot-path.patch
+    - patches/0003-correct-test-for-julia-depot-path.patch
 
 build:
   skip: true  # [win]
diff --git a/recipe/julia-hardcoded-libs.patch b/recipe/patches/julia-hardcoded-libs.patch
similarity index 100%
rename from recipe/julia-hardcoded-libs.patch
rename to recipe/patches/julia-hardcoded-libs.patch
diff --git a/recipe/libgit2-patch.diff b/recipe/patches/libgit2-patch.diff
similarity index 100%
rename from recipe/libgit2-patch.diff
rename to recipe/patches/libgit2-patch.diff
diff --git a/recipe/0001-disable-testing-Vararg-Int-N-where.patch b/recipe/scripts/0001-disable-testing-Vararg-Int-N-where.patch
similarity index 100%
rename from recipe/0001-disable-testing-Vararg-Int-N-where.patch
rename to recipe/scripts/0001-disable-testing-Vararg-Int-N-where.patch
diff --git a/recipe/0002-disable-testing-Baz.baz-1.patch b/recipe/scripts/0002-disable-testing-Baz.baz-1.patch
similarity index 100%
rename from recipe/0002-disable-testing-Baz.baz-1.patch
rename to recipe/scripts/0002-disable-testing-Baz.baz-1.patch
diff --git a/recipe/0003-correct-test-for-julia-depot-path.patch b/recipe/scripts/0003-correct-test-for-julia-depot-path.patch
similarity index 100%
rename from recipe/0003-correct-test-for-julia-depot-path.patch
rename to recipe/scripts/0003-correct-test-for-julia-depot-path.patch

From 9f6cd56da2cfa38c9b88e035efdf6ec2a953c362 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Tue, 28 Dec 2021 22:57:18 -0500
Subject: [PATCH 35/37] remove DS_STORE

---
 recipe/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 recipe/.DS_Store

diff --git a/recipe/.DS_Store b/recipe/.DS_Store
deleted file mode 100644
index 3923bd9ab96b467cbbf5d227df1ed2eb5bd5aa36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOHRWu5S@Wa1hMIorLWK%m@1s07l5{iE*d2gun!kw!#!ZbL3qzIpoC_@0wIKE
zB>Rm$A3INq?GX`OK5Q2va}lY~h)QKbI6Y}Pa_1RPOOBn~$ld;SvD&l~iT>gg_kJRs
zT+6*|WU&9H8*KNBN7L5zdf%?$QN6rAzMVcjUmWIX+U+;Ix*gdXtu|OV)L<YO2nK?I
zVBp6Yz@1I0&J3du27-ZL;FAHK4+)K!9ecxabf7CG0Fck<BG6e&FeW)>$KDVYh*~Jn
zLe)zQwQ$TQ_sfpGp@oZj@u9x*NAaR%b>vUQT{Ig;9}ENoV+M|GIOqL;iC<>2$RCHq
zC>RI^{uu*0t5@|BALV!J!RPU=O=wqW6#Dg4AkasT01SAJoEM|n6Lt7y$KH@xIA6kn
O@enA4L>CPF0t4@^TrZvg


From e03fb8ab73f1062fa43fa49b15b14319bb0968ee Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Tue, 28 Dec 2021 23:15:43 -0500
Subject: [PATCH 36/37] oops place back patches

---
 .../0001-disable-testing-Vararg-Int-N-where.patch                 | 0
 recipe/{scripts => patches}/0002-disable-testing-Baz.baz-1.patch  | 0
 .../0003-correct-test-for-julia-depot-path.patch                  | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename recipe/{scripts => patches}/0001-disable-testing-Vararg-Int-N-where.patch (100%)
 rename recipe/{scripts => patches}/0002-disable-testing-Baz.baz-1.patch (100%)
 rename recipe/{scripts => patches}/0003-correct-test-for-julia-depot-path.patch (100%)

diff --git a/recipe/scripts/0001-disable-testing-Vararg-Int-N-where.patch b/recipe/patches/0001-disable-testing-Vararg-Int-N-where.patch
similarity index 100%
rename from recipe/scripts/0001-disable-testing-Vararg-Int-N-where.patch
rename to recipe/patches/0001-disable-testing-Vararg-Int-N-where.patch
diff --git a/recipe/scripts/0002-disable-testing-Baz.baz-1.patch b/recipe/patches/0002-disable-testing-Baz.baz-1.patch
similarity index 100%
rename from recipe/scripts/0002-disable-testing-Baz.baz-1.patch
rename to recipe/patches/0002-disable-testing-Baz.baz-1.patch
diff --git a/recipe/scripts/0003-correct-test-for-julia-depot-path.patch b/recipe/patches/0003-correct-test-for-julia-depot-path.patch
similarity index 100%
rename from recipe/scripts/0003-correct-test-for-julia-depot-path.patch
rename to recipe/patches/0003-correct-test-for-julia-depot-path.patch

From 86cb8e41bb20110eb6b774e7d15dc10a9ed4452d Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <mkitti@users.noreply.github.com>
Date: Wed, 29 Dec 2021 01:05:35 -0500
Subject: [PATCH 37/37] Apply suggestions from code review, remove "unique"

Co-authored-by: ngam <67342040+ngam@users.noreply.github.com>
---
 recipe/scripts/activate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipe/scripts/activate.sh b/recipe/scripts/activate.sh
index 334920e8..a90fa90a 100644
--- a/recipe/scripts/activate.sh
+++ b/recipe/scripts/activate.sh
@@ -5,10 +5,10 @@ export JULIA_LOAD_PATH_BACKUP=${JULIA_LOAD_PATH:-}
 # Move ~/.julia to a conda environment specific location
 export JULIA_DEPOT_PATH="$CONDA_PREFIX/share/julia:$JULIA_DEPOT_PATH"
 
-# Create a unique shared named environment for each conda environment
+# Create a named environment for each conda environment
 # Use of @ to specify a shared named environment is new as of Julia 1.7
 # https://github.com/JuliaLang/julia/pull/40025
 # The name of the environment is the last directory of the CONDA_PREFIX
 export JULIA_PROJECT="@${CONDA_PREFIX##*/}"
-# Modify load path so that projects stack on the unique shared named environment
+# Modify load path so that projects stack on the conda-named environment
 export JULIA_LOAD_PATH="@:$JULIA_PROJECT:@stdlib"