julia v1.9.0 (#245)

* updated v1.9.0 * MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.06.16.29.06 * fix libgit2 patch * Try removing setting paths * use official relase instead of github release * try `--add-rpath` * try older patchelf=0.17.0 * Revert "try older patchelf=0.17.0" This reverts commit b9a859d. * Remove extraneous symlinks to fix runpath issues * Only remove .so files on Linux * Disable post-link.sh script * Debug library loading * Disable binary relocation * Do not use system MPFR * Remove LD_DEBUG=libs * Cleanup runpath modifications * Revert "Cleanup runpath modifications" This reverts commit a6694df * Just remove --add-path modification --------- Co-authored-by: ngam <[email protected]> Co-authored-by: Mark Kittisopikul <[email protected]>
conda-forge · May 29, 2023 · 8f2a0db · 8f2a0db
1 parent 41f00ab
commit 8f2a0db
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 37 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -3,29 +3,29 @@ arpack:
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 curl:
-- '7'
+- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '11'
+- '12'
 gmp:
 - '6'
 libgit2:
-- '1.5'
+- '1.6'
 libssh2:
 - '1'
 libunwind:

diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -5,21 +5,21 @@ arpack:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 curl:
-- '7'
+- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '11'
+- '12'
 gmp:
 - '6'
 libssh2:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -1,18 +1,11 @@
 #!/bin/sh
 
-export C_INCLUDE_PATH=${PREFIX}/include
-export LD_LIBRARY_PATH=${PREFIX}/lib
-export LIBRARY_PATH=${PREFIX}/lib
-export CMAKE_PREFIX_PATH=${PREFIX}
-export PATH="${PREFIX}/bin:${PATH}"
-
 # Hack to suppress building docs
 cat > doc/Makefile << EOF
 html :	
 	mkdir -p _build/html
 EOF
 
-
 # Julia sets this to unix makefiles later on in its build process
 export CMAKE_GENERATOR="make"
 
@@ -49,7 +42,7 @@ make -j${CPU_COUNT} prefix=${PREFIX} sysconfigdir=${PREFIX}/etc \
  USE_SYSTEM_LAPACK=1 \
  USE_SYSTEM_LIBSSH2=1 \
  USE_SYSTEM_LLVM=0 \
- USE_SYSTEM_MPFR=1 \
+ USE_SYSTEM_MPFR=0 \
  USE_SYSTEM_OPENLIBM=1 \
  USE_SYSTEM_PATCHELF=1 \
  USE_SYSTEM_PCRE=1 \
@@ -66,6 +59,11 @@ make -j${CPU_COUNT} prefix=${PREFIX} sysconfigdir=${PREFIX}/etc \
  CC=$CC CXX=$CXX FC=$FC \
  install
 
+# Address some runpath issues
+if [[ "${target_platform}" == linux-* ]]; then
+    rm $PREFIX/lib/julia/{libcholmod.so,libcurl.so}
+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"

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "julia" %}
-{% set version = "1.8.5" %}
-{% set sha256 = "66602534f36dc7e096228369af57ed8f70b3b98600c51e3364a5d89a5f78ba34" %}
+{% set version = "1.9.0" %}
+{% set sha256 = "222eb533c9dc54734949eb3a4169f54aefa1bc20be385fc1cf798c8219fe6400" %}
 
 package:
   name: {{ name|lower }}
@@ -9,7 +9,7 @@ package:
 source:
   fn: julia-{{ version }}-full.tar.gz
 
-  url: https://github.com/JuliaLang/julia/archive/refs/tags/v{{ version }}.tar.gz
+  url: https://github.com/JuliaLang/julia/releases/download/v{{ version }}/julia-{{ version }}-full.tar.gz
   sha256: {{ sha256 }}
   patches:
     ## from https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
@@ -22,6 +22,7 @@ source:
 build:
   skip: true  # [win]
   number: 0
+  binary_relocation: false
   features:
 
 requirements:
@@ -37,7 +38,6 @@ requirements:
     - patchelf  # [linux]
     - openlibm
     - gmp
-    - mpfr
     - curl
     - libgit2  # [not osx]
     - libssh2
@@ -58,7 +58,6 @@ requirements:
     - libosxunwind  # [osx]
     - libunwind  # [linux]
     - gmp
-    - mpfr
     - openlibm
     - arpack
     - suitesparse

diff --git a/recipe/patches/julia-hardcoded-libs.patch b/recipe/patches/julia-hardcoded-libs.patch
@@ -20,10 +20,10 @@ index 8d1629e..b5a3b60 100644
  if Sys.iswindows()
      const libgit2 = "libgit2.dll"
  elseif Sys.isapple()
--    const libgit2 = "@rpath/libgit2.1.3.dylib"
+-    const libgit2 = "@rpath/libgit2.1.5.dylib"
 +    const libgit2 = "@rpath/libgit2.dylib"
  else
--    const libgit2 = "libgit2.so.1.3"
+-    const libgit2 = "libgit2.so.1.5"
 +    const libgit2 = "libgit2.so"
  end
 

diff --git a/recipe/post-link.sh b/recipe/post-link.sh
@@ -1 +1 @@
-"${PREFIX}/bin/julia" -e 'using Pkg; Pkg.instantiate()' >> "${PREFIX}/.messages.txt" 2>&1
+#"${PREFIX}/bin/julia" -e 'using Pkg; Pkg.instantiate()' >> "${PREFIX}/.messages.txt" 2>&1