From f23902ff7a185f34d9a84218f129d1aba4bca041 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 31 Dec 2023 13:07:27 +0100 Subject: [PATCH 1/2] gnu-built: remove the useless sed It will avoid a rebuilding when doing: bash util/build-gnu.sh && bash util/run-gnu-test.sh ../gnu/tests/rm/empty-inacc.sh --- util/build-gnu.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 8a45e0a8d..19ef4792c 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -102,8 +102,6 @@ for binary in $(./build-aux/gen-lists-of-programs.sh --list-progs); do done if test -f gnu-built; then - # Change the PATH in the Makefile to test the uutils coreutils instead of the GNU coreutils - sed -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" Makefile echo "GNU build already found. Skip" echo "'rm -f $(pwd)/gnu-built' to force the build" echo "Note: the customization of the tests will still happen" From 3560ec68119ebfc1f24d17bd64387b778dbd16f9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 31 Dec 2023 13:07:47 +0100 Subject: [PATCH 2/2] gnu-built: disable some options in the GNU build --- util/build-gnu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 19ef4792c..8ade25e88 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -107,7 +107,7 @@ if test -f gnu-built; then echo "Note: the customization of the tests will still happen" else ./bootstrap --skip-po - ./configure --quiet --disable-gcc-warnings + ./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references #Add timeout to to protect against hangs sed -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver # Change the PATH in the Makefile to test the uutils coreutils instead of the GNU coreutils