Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try using git system on macos #223

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

try using git system on macos #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fb78418
Do not set JULIA_SSL_CA_ROOTS_PATH on macOS
mkitti Sep 1, 2022
ceedd88
Bump build number
mkitti Sep 1, 2022
c324328
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
Sep 1, 2022
64fa1b7
dummy commit for rerendering
conda-forge-admin Sep 2, 2022
ffec323
Update build.sh
ngam Sep 2, 2022
970704a
Update meta.yaml
ngam Sep 2, 2022
82de4ac
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
Sep 2, 2022
1588531
Fix activate.sh and deactivate.sh
mkitti Sep 2, 2022
6ed6539
Add patch to make precompile step verbose
mkitti Sep 2, 2022
4146ec6
Merge branch 'conda_forge_admin_222' of github.com:conda-forge-linter…
mkitti Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ cxx_compiler_version:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '9'
- '11'
gmp:
- '6'
libgit2:
- '1.5'
libssh2:
- '1'
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=1 USE_SYSTEM_MBEDTLS=0"
elif [[ "${target_platform}" == linux-* ]]; then
export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_MBEDTLS=1"
fi
Expand Down
8 changes: 5 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ source:
## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
- patches/0002-disable-testing-Baz.baz-1.patch # [linux]
- patches/julia-libunwind-1.6.patch # [linux]
## Make precompilation verbose to evaluate stalled build
- patches/0003-Debug-precompile.patch

build:
skip: true # [win]
number: 0
number: 1
features:

requirements:
Expand All @@ -41,7 +43,7 @@ requirements:
- gmp
- mpfr
- curl
- libgit2 # [not osx]
- libgit2
- libssh2
- libosxunwind # [osx]
- libunwind # [linux]
Expand All @@ -66,7 +68,7 @@ requirements:
- suitesparse
- pcre2
- curl
- libgit2 # [not osx]
- libgit2
- libssh2
- mbedtls # [not osx]
- git
Expand Down
25 changes: 25 additions & 0 deletions recipe/patches/0003-Debug-precompile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From da3ced7c171b3fabf8e3ffa836912dfc47b67c85 Mon Sep 17 00:00:00 2001
From: Mark Kittisopikul <[email protected]>
Date: Fri, 2 Sep 2022 05:32:22 -0400
Subject: [PATCH] Debug precompile

---
contrib/generate_precompile.jl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/generate_precompile.jl b/contrib/generate_precompile.jl
index a10d195229..c246a24d7e 100644
--- a/contrib/generate_precompile.jl
+++ b/contrib/generate_precompile.jl
@@ -242,7 +242,7 @@ const HELP_PROMPT = "help?> "

function generate_precompile_statements()
start_time = time_ns()
- debug_output = devnull # or stdout
+ debug_output = stdout
sysimg = Base.unsafe_string(Base.JLOptions().image_file)

# Extract the precompile statements from the precompile file
--
2.37.2

11 changes: 10 additions & 1 deletion recipe/scripts/activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh

export JULIA_DEPOT_PATH_BACKUP=${JULIA_DEPOT_PATH:-}
export JULIA_PROJECT_BACKUP=${JULIA_PROJECT:-}
export JULIA_LOAD_PATH_BACKUP=${JULIA_LOAD_PATH:-}
Expand All @@ -15,7 +17,14 @@ export JULIA_LOAD_PATH="@:$JULIA_PROJECT:@stdlib"

# make julia use same cert
export JULIA_SSL_CA_ROOTS_PATH_BACKUP=${JULIA_SSL_CA_ROOTS_PATH:-}
export JULIA_SSL_CA_ROOTS_PATH=$CONDA_PREFIX/ssl/cacert.pem
if [[ $OSTYPE != 'darwin'* ]]; then
export JULIA_SSL_CA_ROOTS_PATH=$CONDA_PREFIX/ssl/cacert.pem
fi
# Otherwise, do nothing since we get the following error on macos:
# Your Julia is built with a SSL/TLS engine that libgit2 doesn't know
# how to configure to use a file or directory of certificate authority
# roots.


# Setup variables for Conda.jl
export CONDA_JL_HOME_BACKUP=${CONDA_JL_HOME:-}
Expand Down
2 changes: 2 additions & 0 deletions recipe/scripts/deactivate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh

export JULIA_DEPOT_PATH=$JULIA_DEPOT_PATH_BACKUP
export JULIA_PROJECT=$JULIA_PROJECT_BACKUP
export JULIA_LOAD_PATH=$JULIA_LOAD_PATH_BACKUP
Expand Down