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

Jump to bottom

GMP 6.2.0 #1159

Merged
merged 1 commit into from
Jun 16, 2020
Merged

GMP 6.2.0 #1159

Show file tree
Hide file tree
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
15 changes: 2 additions & 13 deletions G/GMP/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,20 @@ using BinaryBuilder

# Collection of sources required to build GMP
name = "GMP"
version = v"6.1.2"
version = v"6.2.0"

sources = [
ArchiveSource("https://gmplib.org/download/gmp/gmp-$(version).tar.bz2",
"5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2"),
"f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea"),
DirectorySource("./bundled"),
]

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir/gmp-*

# Update config.status
update_configure_scripts
Copy link
Member Author

Choose a reason for hiding this comment

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

Despite the comment, I think this actually updates config.guess and config.sub ; both are fairly recent in GMP 6.2.0, so this shouldn't be necessary anymore


# Patch `configure` to include `$LDFLAGS` in its tests. This is necessary on FreeBSD.
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/configure.patch
fingolfin marked this conversation as resolved.
Show resolved Hide resolved

# Include Julia-carried patches
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/gmp_alloc_overflow_func.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/gmp-exception.patch
Copy link
Member Author

Choose a reason for hiding this comment

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

GMP 6.2.0 already includes this change.


flags=(--enable-cxx --enable-shared --disable-static)

Expand All @@ -35,10 +28,6 @@ fi

./configure --prefix=$prefix --build=${MACHTYPE} --host=${target} ${flags[@]}

# Something is broken in the libtool that gets generated on macOS; I can't
# figure out why, but `hardcode_action` is set to blank for CXX files. /shrug
sed -i -e 's&hardcode_action=$&hardcode_action=immediate&g' libtool
Copy link
Member Author

Choose a reason for hiding this comment

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

This was added by @staticfloat in d2b4c53 but once again I don't know how exactly the issues it works around manifested; GMP 6.2.0 builds fine without it. But perhaps the issue was not about a build issue but rather about an issue with using the resulting libraries?

Copy link
Member

Choose a reason for hiding this comment

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

I believe this was an issue while building, so if it builds without doing this, great!


make -j${nproc}
make install

Expand Down
Loading