Skip to content

Commit

Permalink
BuildPackages.sh: run prerequisites.sh if present
Browse files Browse the repository at this point in the history
This script is used by Semigroups. While it doesn't do anything for
released versions of the package (as far as I can tell), it seems
sensible to run it here. This way then, we can e.g. simplify some
of the code used in gap-infra.

Also check that autogen.sh resp. configure are executable,
not just merely files.
  • Loading branch information
fingolfin committed Apr 20, 2020
1 parent e89f016 commit 77f179c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions bin/BuildPackages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ build_fail() {
run_configure_and_make() {
# We want to know if this is an autoconf configure script
# or not, without actually executing it!
if [[ -f autogen.sh && ! -f configure ]]
if [[ -x autogen.sh && ! -x configure ]]
then
./autogen.sh
fi
if [[ -f "configure" ]]
if [[ -x configure ]]
then
if grep Autoconf ./configure > /dev/null
then
Expand Down Expand Up @@ -201,6 +201,10 @@ build_one_package() {
( # start subshell
set -e
cd "$CURDIR/$PKG"
if [[ -x prerequisites.sh ]]
then
./prerequisites.sh
fi
case "$PKG" in
# All but the last lines should end by '&&', otherwise (for some reason)
# some packages that fail to build will not get reported in the logs.
Expand Down

0 comments on commit 77f179c

Please sign in to comment.