From 75548adee9060096c48c22f3f5d85b4649d6d219 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 3 Oct 2024 13:51:37 +0200 Subject: [PATCH] Manually checkout iconvc subcheckout --- scripts.d/20-libiconv.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index d6af66919..3e059c12b 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -3,13 +3,16 @@ SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" SCRIPT_COMMIT="0d94621c1e182f5a13a9504523afcb01ec546b37" +SCRIPT_REPO2="https://git.savannah.gnu.org/git/gnulib.git" +SCRIPT_COMMIT2="eb515396a8506286d5bfa05a9cca4044c1750ff5" + ffbuild_enabled() { return 0 } ffbuild_dockerdl() { echo "retry-tool sh -c \"rm -rf iconv && git clone '$SCRIPT_REPO' iconv\" && git -C iconv checkout \"$SCRIPT_COMMIT\"" - echo "cd iconv && retry-tool ./autopull.sh --one-time" + echo "cd iconv && retry-tool sh -c \"rm -rf gnulib && git clone '$SCRIPT_REPO2' gnulib\" && git -C gnulib checkout \"$SCRIPT_COMMIT2\" && rm -rf gnulib/.git" } ffbuild_dockerbuild() {