Skip to content

Commit 44230fb

Browse files
authored
[GSL] Update to 2.8 (#9899)
* [GSL] Update to 2.8 * GSL: remove unknown ld option * GSL: add patch dir to src * GSL: fix patch format * GLS: exclude aarch64-unknown-freebsd
1 parent 670483c commit 44230fb

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

G/GSL/GSL@2/build_tarballs.jl

+8-7
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
using BinaryBuilder
44

55
name = "GSL"
6-
version_string = "2.7.1"
7-
version = v"2.7.2" # <--- This version number is a lie to keep it different from our
8-
# previous fake "2.7.1" build, as they have different ABI because of
9-
# https://git.savannah.gnu.org/cgit/gsl.git/commit/configure.ac?id=77e7c7d008707dace56626020eaa6181912e9841
6+
version_string = "2.8"
7+
version = VersionNumber(version_string)
108

119
# Collection of sources required to build GSL
1210
sources = [
13-
ArchiveSource("http://ftp.gnu.org/gnu/gsl/gsl-$(version_string).tar.gz",
14-
"dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b"),
11+
ArchiveSource("https://ftp.gnu.org/gnu/gsl/gsl-$(version_string).tar.gz",
12+
"6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190"),
13+
DirectorySource("./bundled"),
1514
]
1615

1716
# Bash recipe for building across all platforms
@@ -23,14 +22,16 @@ if [[ "${target}" == aarch64-apple-darwin* ]]; then
2322
# happy.
2423
export MACOSX_DEPLOYMENT_TARGET="10.16"
2524
fi
25+
26+
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/0001-remove-unknown-ld-option.patch
2627
./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-static
2728
make -j${nproc}
2829
make install
2930
"""
3031

3132
# These are the platforms we will build for by default, unless further
3233
# platforms are passed in on the command line
33-
platforms = supported_platforms(; experimental=true)
34+
platforms = supported_platforms(; exclude=[Platform("aarch64", "freebsd")], experimental=true)
3435

3536
# The products that we will ensure are always built
3637
products = [
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Remove unknown linker option: -no_fixup_chains
2+
3+
--- a/configure 2024-05-25 21:26:49.000000000 +0800
4+
+++ b/configure 2024-11-30 23:33:16.848212900 +0800
5+
@@ -8764,7 +8764,7 @@
6+
10.[012],*|,*powerpc*-darwin[5-8]*)
7+
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
8+
*)
9+
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup $wl-no_fixup_chains' ;;
10+
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
11+
esac
12+
;;
13+
esac

0 commit comments

Comments
 (0)