From 9d9bc327773651c706a98012cb3a4bb667446d1f Mon Sep 17 00:00:00 2001 From: Jeremiah <4462211+jeremiahpslewis@users.noreply.github.com> Date: Thu, 10 Feb 2022 12:11:21 +0100 Subject: [PATCH] [Mineos] Version bump (#4402) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Mineos] Version bump * Seems to resolve autoconf error * Drop unused arg * Skip docs * Retry doc disable * Add Autogen.sh * Bump version * Add comment * Switch to 1.0.2 commit * Patch docs * Fix path * Fix clang warning * Update M/Mineos/build_tarballs.jl Co-authored-by: Mosè Giordano * Thanks Mose! * Swap back to fork * Delete drop_docs.diff * Update build_tarballs.jl * Try more compact fortran flag Co-authored-by: Mosè Giordano --- M/Mineos/build_tarballs.jl | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/M/Mineos/build_tarballs.jl b/M/Mineos/build_tarballs.jl index a55ff31598d..c4264158db1 100644 --- a/M/Mineos/build_tarballs.jl +++ b/M/Mineos/build_tarballs.jl @@ -3,19 +3,31 @@ using BinaryBuilder name = "Mineos" -version = v"1.0" +version = v"1.0.1" # Artificial version number for bumping Julia compat (and expanding platforms) # Collection of sources required to build Mineos sources = [ - "https://github.com/anowacki/mineos.git" => - "e2558b486d7656ef112608a8776643da66dc87cf", + GitSource("https://github.com/anowacki/mineos.git", "e2558b486d7656ef112608a8776643da66dc87cf"), ] # Bash recipe for building across all platforms script = raw""" cd ${WORKSPACE}/srcdir/mineos + +# Fix clang error 'error: non-void function * should return a value [-Wreturn-type]' +if [[ "${target}" == *-freebsd* ]] || [[ "${target}" == *-apple-* ]]; then + export CFLAGS="-Wno-return-type" +fi + +# Fix issue due to GCC 10+. Only necessary on aarch64-apple as others use earlier GCC +# Error: Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) +if [[ "${target}" == aarch64-apple-* ]]; then + export FFLAGS="-std=legacy" +fi + ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-doc make + make install """ @@ -40,5 +52,5 @@ dependencies = [ ] # Build the tarballs, and possibly a `build.jl` as well. -build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies) +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat = "1.6")