Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-scripts/bootstrap-tarballs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ rm -f cfengine-3.*.tar.gz
git rev-parse HEAD >"$BASEDIR"/output/core-commitID
# Configure in order to run "make dist", deleted later.
log_debug "Running configure on core repository..."
run_and_print_on_failure ./configure -C
configure_or_print_config_log -C
# Normalize source timestamps to avoid errors like:
# configure: error: newly created file is older than distributed files!
find . -exec touch -t 202501010000.00 {} +
Expand All @@ -111,7 +111,7 @@ rm -f cfengine-masterfiles*.tar.gz
git rev-parse HEAD >"$BASEDIR"/output/masterfiles-commitID
# Configure in order to run "make dist", deleted later.
log_debug "Running configure on masterfiles repository..."
run_and_print_on_failure ./configure
configure_or_print_config_log
# Normalize source timestamps to avoid errors like:
# configure: error: newly created file is older than distributed files!
find . -exec touch -t 202501010000.00 {} +
Expand Down
8 changes: 4 additions & 4 deletions build-scripts/configure
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,19 @@ fi

log_debug running configure on core repo...
# shellcheck disable=SC2086
(cd "$BASEDIR"/core && run_and_print_on_failure env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS)
(cd "$BASEDIR"/core && CFLAGS="$CFLAGS" configure_or_print_config_log $ARGS)

if [ "$NOVA" = yes ]; then
log_debug running configure on enterprise repo...
# shellcheck disable=SC2086
(cd "$BASEDIR"/enterprise && run_and_print_on_failure env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS)
(cd "$BASEDIR"/enterprise && CFLAGS="$CFLAGS" configure_or_print_config_log $ARGS)
if [ "$ROLE" = hub ]; then
log_debug running configure on nova repo...
# shellcheck disable=SC2086
(cd "$BASEDIR"/nova && run_and_print_on_failure env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS)
(cd "$BASEDIR"/nova && CFLAGS="$CFLAGS" configure_or_print_config_log $ARGS)
fi
fi

log_debug running configure on masterfiles repo...
# shellcheck disable=SC2086
(cd "$BASEDIR"/masterfiles && run_and_print_on_failure env $OPTS CFLAGS="$CFLAGS" ./configure $ARGS)
(cd "$BASEDIR"/masterfiles && CFLAGS="$CFLAGS" configure_or_print_config_log $ARGS)
15 changes: 15 additions & 0 deletions build-scripts/functions
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,21 @@ run_and_print_on_failure() {
return $exit_code
}

# configure_or_print_config_log: run ./configure in the current directory, cat config.log in case of failure
# Args:
# $@ - all passed to ./configure
configure_or_print_config_log() {
run_and_print_on_failure ./configure $@
rc=$?
if [ "$rc" != "0" ]; then
echo "Failed to run ./configure $@ in $(pwd)"
echo "--- Start of config.log ---"
cat config.log
echo "--- End of config.log ---"
exit $rc
fi
}

# log_debug: Print a debug message with script name prefix
# Args:
# $@ - Debug message
Expand Down
Loading