[bsd] Checkout older version of gnulib

gnu-libtool · Oct 30, 2024 · 840e7e3 · 840e7e3
1 parent 03d651b
commit 840e7e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/build-dev-tarball.sh b/build-dev-tarball.sh
@@ -39,13 +39,14 @@ git clone --depth 2 -b "$branch" https://git.savannah.gnu.org/git/"$package".git
 git clone --depth 1 https://git.savannah.gnu.org/git/gnulib.git
 
 # Apply patches.
-(cd "$package" && patch -p1 < ../patches/0001-libtool.m4-Update-hardcode_shlibpath_var-for-OpenBSD.patch \
-               && patch -p1 < ../patches/0002-gnulib-Revert-submodule-to-older-commit.patch)
+(cd "$package" && patch -p1 < ../patches/0001-libtool.m4-Update-hardcode_shlibpath_var-for-OpenBSD.patch)
 
 export GNULIB_SRCDIR=`pwd`/gnulib
+(cd "$GNULIB_SRCDIR" && git checkout 30417e7f918e95c368ef56a650fa5b5fa45cb130)
+
 cd "$package"
 # Force use of the newest gnulib.
-# rm -f .gitmodules
+rm -f .gitmodules
 
 # Fetch extra files and generate files (uses packages wget, python3, automake, autoconf, m4,
 # texinfo, xz-utils).

diff --git a/patches/0002-gnulib-Revert-submodule-to-older-commit.patch b/patches/0002-gnulib-Revert-submodule-to-older-commit.patch