From a704f98b974b49f374e86f615c970a0258a0309e Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Mon, 27 Mar 2017 07:37:09 -0700 Subject: [PATCH 1/2] travis-ci: move path to built dependencies to front of PATH In order to allow travis-dep-builder.sh downloaded and built dependencies to override OS installed tools, move the PATHs for these utils to the front of PATH, instead of the end. --- src/test/travis-dep-builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/travis-dep-builder.sh b/src/test/travis-dep-builder.sh index ff824fa88452..b48894d3e0a2 100755 --- a/src/test/travis-dep-builder.sh +++ b/src/test/travis-dep-builder.sh @@ -102,7 +102,7 @@ print_env () { echo "export CPPFLAGS=-I${prefix}/include" echo "export LDFLAGS=-L${prefix}/lib" echo "export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig" - echo "export PATH=${PATH}:${HOME}/.local/bin:${HOME}/local/usr/bin:${HOME}/local/bin" + echo "export PATH=${HOME}/.local/bin:${HOME}/local/usr/bin:${prefix}/bin:${PATH}" luarocks path --bin } From f2e76271165a4a0d3eb00c04803d704073ea2bd0 Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Sun, 26 Mar 2017 08:18:21 -0700 Subject: [PATCH 2/2] travis-ci: update autotools Override travis OS provided autotools with latest GNU packages available. This should give tarballs built with `make dist` in travis to build on latest architectures like ppc64le. Fixes #925. --- src/test/travis-dep-builder.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/travis-dep-builder.sh b/src/test/travis-dep-builder.sh index b48894d3e0a2..a747efde7e47 100755 --- a/src/test/travis-dep-builder.sh +++ b/src/test/travis-dep-builder.sh @@ -16,7 +16,10 @@ https://github.com/zeromq/czmq/archive/v3.0.2.tar.gz \ http://downloads.sourceforge.net/ltp/lcov-1.10.tar.gz \ http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.0.tar.gz \ http://www.digip.org/jansson/releases/jansson-2.9.tar.gz \ -http://www.mpich.org/static/downloads/3.1.4/mpich-3.1.4.tar.gz" +http://www.mpich.org/static/downloads/3.1.4/mpich-3.1.4.tar.gz \ +https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz \ +https://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz \ +https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz" declare -A extra_configure_opts=(\ ["mpich-3.1.4"]="--disable-fortran --disable-cxx --disable-maintainer-mode --disable-dependency-tracking --enable-shared --disable-wrapper-rpath" \