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.

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

[Mineos] Version bump #4402

Merged
merged 18 commits into from
Feb 10, 2022
Merged
25 changes: 19 additions & 6 deletions M/Mineos/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,32 @@
using BinaryBuilder

name = "Mineos"
version = v"1.0"
version = v"1.0.2"
jeremiahpslewis marked this conversation as resolved.
Show resolved Hide resolved

# Collection of sources required to build Mineos
sources = [
"https://github.com/anowacki/mineos.git" =>
"e2558b486d7656ef112608a8776643da66dc87cf",
jeremiahpslewis marked this conversation as resolved.
Show resolved Hide resolved
GitSource("https://github.com/geodynamics/mineos.git", "3dd7c7433766d630b929d8254d03e705808ff8a3"),
DirectorySource("./bundled"),
]

# Bash recipe for building across all platforms
script = raw"""
cd ${WORKSPACE}/srcdir/mineos
./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-doc
make

# Drop docs build target
atomic_patch -p1 ../patches/drop_docs.diff
jeremiahpslewis marked this conversation as resolved.
Show resolved Hide resolved

autoupdate
jeremiahpslewis marked this conversation as resolved.
Show resolved Hide resolved
autoreconf --install
./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target}

# Fix clang error 'error: non-void function * should return a value [-Wreturn-type]'
if [[ "${target}" != *-freebsd* ]] || [[ "${target}" == *-apple-* ]]; then
make CFLAGS="-Wno-return-type $cflags"
else
make
fi
jeremiahpslewis marked this conversation as resolved.
Show resolved Hide resolved

make install
"""

Expand All @@ -40,5 +53,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")

18 changes: 18 additions & 0 deletions M/Mineos/bundled/patches/drop_docs.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/Makefile.am b/Makefile.am
index 3bab87e..e5ade1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,13 +24,6 @@ bin_PROGRAMS = minos_bran syndat green eigcon \

dist_bin_SCRIPTS = scripts/creat_origin

-# demo
-
-dist_pkgdata_DATA = \
- doc/mineos.pdf \
- DEMO/DEMO.tar.gz \
- DEMO/README
-
# main programs

minos_bran_SOURCES = minos_bran.f