Skip to content

Commit

Permalink
Merge branch 'feature/pr_env' into release/5.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Daily committed Mar 30, 2018
2 parents 0f936bc + 0f3fe27 commit fad6397
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ The Unreleased section will be empty for tagged releases. Unreleased functionali
- Removed case statement from install-autotools.sh
- Fixed
- install-autotools.sh works on FreeBSD
- patch locally built m4 for OSX High Sierra
- Closed Issues Requests
- Scalapack with 8-byte integers? [\#93]
- Please clarify what is "peigs" library [\#96]
Expand Down
16 changes: 12 additions & 4 deletions travis/install-autotools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,18 @@ else
cd ${TOP}/${TDIR}
cp ${TOP}/bin/config.guess ./build-aux/config.guess
cp ${TOP}/bin/config.sub ./build-aux/config.sub
if [ -f secure_snprintf.patch ] ; then
echo secure_snprintf.patch already exists! Using existing copy.
else
${download} secure_snprintf.patch https://raw.githubusercontent.com/macports/macports-ports/master/devel/m4/files/secure_snprintf.patch
fi
if patch -p0 -N < secure_snprintf.patch ; then
echo patch applied
fi
./configure --prefix=${TOP} && make -j ${MAKE_JNUM} && make install
if [ "x$?" != "x0" ] ; then
echo FAILURE 1
exit
exit 1
fi
fi
# refresh the path
Expand Down Expand Up @@ -150,7 +158,7 @@ else
./configure --prefix=${TOP} && make -j ${MAKE_JNUM} && make install
if [ "x$?" != "x0" ] ; then
echo FAILURE 3
exit
exit 3
fi
fi
# refresh the path
Expand Down Expand Up @@ -197,7 +205,7 @@ else
./configure --prefix=${TOP} && make -j ${MAKE_JNUM} && make install
if [ "x$?" != "x0" ] ; then
echo FAILURE 4
exit
exit 4
fi
fi
# refresh the path
Expand Down Expand Up @@ -252,7 +260,7 @@ else
./configure --prefix=${TOP} && make -j ${MAKE_JNUM} && make install
if [ "x$?" != "x0" ] ; then
echo FAILURE 2
exit
exit 2
fi
fi
# refresh the path
Expand Down

0 comments on commit fad6397

Please sign in to comment.