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

Upgrade to wrapit 1.5.0 and change clang/LLVM version to 13 #10282

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Upgrade to wrapit 1.5.0 and change clang/LLVM version to 13 #10282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions W/WrapIt/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder, Pkg
name = "WrapIt"
version = v"1.4.0"
version = v"1.5.0"

#Clang_jll version used for the build. Required clang libraries will be shipped with the package.
clang_vers=v"16.0.6+3"
clang_vers=v"13.0.1+3"
clang_vers_maj=string(clang_vers.major)
clang_patch="$(clang_vers.major).$(clang_vers.minor).$(clang_vers.patch)"

# Collection of sources required to complete build
sources = [
GitSource("https://github.com/grasph/wrapit.git", "5168a24862f6cc8a74cdd0c9427dee1baab4fa81")
GitSource("https://github.com/grasph/wrapit.git", "14eb9a69902c714fde9924804e756c24e097272d")
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz",
"2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62")
]
Expand Down Expand Up @@ -42,6 +43,7 @@ cmake -GNinja \
-DCLANG_JLL=True \
-DOPENSSL_USE_STATIC_LIBS=True \
-DCLANG_RESOURCE_DIR="$clang_resource_dir" \
-DOPENSSL_ROOT_DIR="$prefix" -DOPENSSL_CRYPTO_LIBRARY="$libdir/libcrypto.$dlext" \
../wrapit/
cmake --build .
cmake --install .
Expand All @@ -62,6 +64,9 @@ cd "$(readlink -f "$prefix")"
llvmversiontag=`echo $clangversiontag | sed 's/^\./-/'` #.NNjl -> -NNjl
fi
clanglib=libclang.$dlext$clangversiontag
if [ $clanglib=libclang.so.13jl ] && ! [ -f $libdir/libclang.so.13jl ] && [ -f $libdir/libclang.so.13 ]; then
clanglib=libclang.so.13
fi
clangcpplib=libclang-cpp.$dlext$clangversiontag
llvmlib=libLLVM$llvmversiontag.${dlext}

Expand Down Expand Up @@ -94,7 +99,11 @@ EOF
# Add a link to the clang resource directory
ln -sf artifacts/$clang_uuid ..
mkdir -p lib/$clang_resource_dir
cp -rp ../artifacts/$clang_uuid/lib/clang/""" * clang_vers_maj * raw"""/include lib/"$clang_resource_dir"
if [ -f ../artifacts/$clang_uuid/lib/clang/""" * clang_vers_maj * raw""" ]; then
cp -rp ../artifacts/$clang_uuid/lib/clang/""" * clang_vers_maj * raw"""/include lib/"$clang_resource_dir"
else
cp -rp ../artifacts/$clang_uuid/lib/clang/""" * clang_patch * raw"""/include lib/"$clang_resource_dir"
fi

# Add libraries used by wrapit. Make copy as we haven't found how
# To get symlinks to regular files included in the genrated tarball.
Expand Down