Skip to content

Commit

Permalink
[Libffi] Upgrade to v3.4.4 (#5834)
Browse files Browse the repository at this point in the history
* [Libffi] Upgrade to v3.4.4

* [Libffi] Require GCC 6, needed for generating assembly for 32-bit Win
  • Loading branch information
giordano authored Nov 9, 2022
1 parent dd0e58a commit cca8463
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 43 deletions.
24 changes: 12 additions & 12 deletions L/Libffi/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
using BinaryBuilder

name = "Libffi"
version = v"3.2.1"

upstream_version = "3.4.4"
version = VersionNumber(upstream_version)

# Collection of sources required to build libffi
sources = [
ArchiveSource("https://sourceware.org/pub/libffi/libffi-$(version).tar.gz",
"d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"),
DirectorySource("./bundled"),
ArchiveSource("https://github.com/libffi/libffi/releases/download/v$(upstream_version)/libffi-$(upstream_version).tar.gz",
"d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"),
]

version = v"3.2.2" # <-- this is a lie, we need to bump the version to require julia v1.6

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir/libffi-*/
atomic_patch -p1 ../patches/*
update_configure_scripts
autoreconf -f -i
./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-static --enable-shared
./configure --prefix=${prefix} \
--build=${MACHTYPE} \
--host=${target} \
--disable-static \
--enable-shared \
--disable-multi-os-directory
make -j${nproc}
make install
"""

# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
platforms = supported_platforms(; experimental=true)
platforms = supported_platforms()

# The products that we will ensure are always built
products = [
Expand All @@ -38,4 +38,4 @@ dependencies = Dependency[
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version=v"6")
31 changes: 0 additions & 31 deletions L/Libffi/bundled/patches/0001-libdir-no-touchy.patch

This file was deleted.

0 comments on commit cca8463

Please sign in to comment.