Mercurial > jwe > octave
changeset 31129:441aa6226223
build: cache REPRODUCIBLE_TAR_FLAGS in configure (bug #62715)
* acinclude.m4 (OCTAVE_PROG_TAR_REPRODUCIBLE): Use AC_CACHE_CHECK macro for
"octave_cv_tar_flags".
author | Rik <rik@octave.org> |
---|---|
date | Thu, 07 Jul 2022 21:27:00 -0700 |
parents | 1d819b308578 |
children | c4f52c6c5944 |
files | m4/acinclude.m4 |
diffstat | 1 files changed, 19 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Thu Jul 07 11:59:37 2022 -0700 +++ b/m4/acinclude.m4 Thu Jul 07 21:27:00 2022 -0700 @@ -3500,23 +3500,26 @@ dnl AC_DEFUN([OCTAVE_PROG_TAR_REPRODUCIBLE], [ AC_MSG_CHECKING([for options to make reproducible archives with GNU tar]) -dnl This uses Automake's logic for finding GNU tar under various names - for octave_tar in tar gnutar gtar :; do - $octave_tar --version >/dev/null 2>&1 && break - done -dnl If we have a valid GNU tar program, see if it supports sets of options - if test x"$octave_tar" != x:; then - octave_tar_flags= - echo > conftest.txt - for octave_tar_flag in --owner=0 --group=0 --numeric-owner --sort=name; do - $octave_tar -cf conftest.tar $octave_tar_flags $octave_tar_flag conftest.txt 2>/dev/null - if test $? -eq 0; then - octave_tar_flags="${octave_tar_flags:+$octave_tar_flags }$octave_tar_flag" - fi + AC_CACHE_VAL([octave_cv_tar_flags], + [octave_cv_tar_flags= + dnl This uses Automake's logic for finding GNU tar under various names + for octave_tar in tar gnutar gtar :; do + $octave_tar --version >/dev/null 2>&1 && break done - rm -f conftest.tar conftest.txt - REPRODUCIBLE_TAR_FLAGS="$octave_tar_flags" - fi + dnl If we have a valid GNU tar program, see if it supports sets of options + if test x"$octave_tar" != x:; then + echo > conftest.txt + for octave_tar_flag in --owner=0 --group=0 --numeric-owner --sort=name; do + $octave_tar -cf conftest.tar $octave_cv_tar_flags $octave_tar_flag conftest.txt 2>/dev/null + if test $? -eq 0; then + octave_cv_tar_flags="${octave_cv_tar_flags:+$octave_cv_tar_flags }$octave_tar_flag" + fi + done + rm -f conftest.tar conftest.txt + fi + ]) + + REPRODUCIBLE_TAR_FLAGS="$octave_cv_tar_flags" AC_SUBST(REPRODUCIBLE_TAR_FLAGS) AC_MSG_RESULT([$REPRODUCIBLE_TAR_FLAGS]) ])