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

GSL: New version 2.7.1 #5019

Merged
merged 3 commits into from
Jun 11, 2022
Merged

GSL: New version 2.7.1 #5019

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a41411
GSL: New version 2.7.1
eschnett Jun 10, 2022
06331d0
GSL: Keep version at 2.7.1
eschnett Jun 10, 2022
92cae85
[GSL@2] Fix for aarch64-apple-darwin
giordano Jun 11, 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
15 changes: 12 additions & 3 deletions G/GSL/GSL@2/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,26 @@
using BinaryBuilder

name = "GSL"
version = v"2.7.1" # <--- This version number is a lie to build for experimental platforms
version_string = "2.7.1"
version = v"2.7.2" # <--- This version number is a lie to keep it different from our
# previous fake "2.7.1" build, as they have different ABI because of
# https://git.savannah.gnu.org/cgit/gsl.git/commit/configure.ac?id=77e7c7d008707dace56626020eaa6181912e9841

# Collection of sources required to build GSL
sources = [
ArchiveSource("http://ftp.gnu.org/gnu/gsl/gsl-$(version.major).$(version.minor).tar.gz",
"efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b"),
ArchiveSource("http://ftp.gnu.org/gnu/gsl/gsl-$(version_string).tar.gz",
"dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b"),
]

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir/gsl-*/
if [[ "${target}" == aarch64-apple-darwin* ]]; then
# aclocal.m4 has some lines where it expects `MACOSX_DEPLOYMENT_TARGET` to be up to
# version 10. Let's pretend to be 10.16, as many tools do to make old build systems
# happy.
export MACOSX_DEPLOYMENT_TARGET="10.16"
fi
Comment on lines +20 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also explains why the previous build worked: before JuliaPackaging/BinaryBuilderBase.jl#217 we used to unconditionally set MACOSX_DEPLOYMENT_TARGET="10.8".

./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-static
make -j${nproc}
make install
Expand Down