Commit 400eadb6 authored by Matthew Brett's avatar Matthew Brett
Browse files

Fix up some library builds

parent 2c9e7808
...@@ -74,21 +74,15 @@ function build_simple { ...@@ -74,21 +74,15 @@ function build_simple {
function build_github { function build_github {
# Example: build_github fredrik-johansson/arb 2.11.1 # Example: build_github fredrik-johansson/arb 2.11.1
local path=$1 local path=$1
local version=$2 local tag_name=$2
local configure_args=${@:3} local configure_args=${@:3}
local name=`basename "$path"` local name=`basename "$path"`
# This is tricky. If the version name starts with a "v", local name_tag_name="${name}-${tag_name}"
# then the archive name will not start with a "v"
if [[ $version == v* ]]; then
local name_version="${name}-${version:1}"
else
local name_version="${name}-${version}"
fi
if [ -e "${name}-stamp" ]; then if [ -e "${name}-stamp" ]; then
return return
fi fi
fetch_unpack "https://github.com/${path}/archive/${version}.tar.gz" fetch_unpack "https://github.com/${path}/archive/${tag_name}.tar.gz"
(cd $name_version \ (cd $name_tag_name \
&& ./configure --prefix=$BUILD_PREFIX $configure_args \ && ./configure --prefix=$BUILD_PREFIX $configure_args \
&& make -j4 \ && make -j4 \
&& make install) && make install)
...@@ -102,7 +96,7 @@ function build_openblas { ...@@ -102,7 +96,7 @@ function build_openblas {
brew link --force openblas brew link --force openblas
else else
mkdir -p $ARCHIVE_SDIR mkdir -p $ARCHIVE_SDIR
local plat=${1:-$PLAT} local plat=${1:-${PLAT:-x86_64}}
local tar_path=$(abspath $(_mb_get_gf_lib "openblas-${OPENBLAS_VERSION}" "$plat")) local tar_path=$(abspath $(_mb_get_gf_lib "openblas-${OPENBLAS_VERSION}" "$plat"))
(cd / && tar zxf $tar_path) (cd / && tar zxf $tar_path)
fi fi
......
...@@ -12,7 +12,10 @@ suppress build_libpng ...@@ -12,7 +12,10 @@ suppress build_libpng
suppress build_libwebp suppress build_libwebp
suppress build_szip suppress build_szip
suppress build_swig suppress build_swig
suppress build_github fredrik-johansson/arb 2.13.0 # We need to find a test for build_github
# It needs a standalone C library with ./configure script.
# arb (below) requires a couple of other libraries.
# suppress build_github fredrik-johansson/arb 2.13.0
suppress build_flex suppress build_flex
suppress build_openblas suppress build_openblas
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment