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.

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

[LibGit2] Do not load OpenSSL on Windows and macOS #8401

Merged
merged 1 commit into from
Apr 1, 2024
Merged
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions L/LibGit2/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ elif [[ ${target} == *linux* ]] || [[ ${target} == *freebsd* ]] || [[ ${target}
BUILD_FLAGS+=(-DUSE_HTTPS=OpenSSL -DUSE_SHA1=CollisionDetection -DCMAKE_INSTALL_RPATH="\$ORIGIN")
fi

# Necessary for cmake to find openssl on Windows
if [[ ${target} == x86_64-*-mingw* ]]; then
export OPENSSL_ROOT_DIR=${prefix}/lib64
fi

mkdir build && cd build

cmake .. "${BUILD_FLAGS[@]}"
Expand All @@ -75,7 +70,7 @@ llvm_version = v"13.0.1"
# Dependencies that must be installed before this package can be built
dependencies = [
Dependency("LibSSH2_jll"; compat="1.11.0"),
Dependency("OpenSSL_jll"; compat="3.0.8"),
Dependency("OpenSSL_jll"; compat="3.0.8", platforms=filter(p -> !(Sys.iswindows(p) || Sys.isapple(p)), platforms)),
BuildDependency(PackageSpec(name="LLVMCompilerRT_jll", uuid="4e17d02c-6bf5-513e-be62-445f41c75a11", version=llvm_version);
platforms=filter(p -> sanitize(p)=="memory", platforms)),
]
Expand Down