From 81dedbe298d8060cb6008b725da9c24ac6136b94 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 3 Jul 2023 11:27:40 -0400 Subject: [PATCH] stick with submodule commit defined in repository Use the submodule commit already defined in the repository on submodule update, rather than pulling the most recent commit in Makefiles. --- sys/unix/Makefile.top | 3 ++- sys/windows/Makefile.mingw32 | 6 ++++-- sys/windows/Makefile.nmake | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top index cfbaad364..5af41190b 100644 --- a/sys/unix/Makefile.top +++ b/sys/unix/Makefile.top @@ -150,7 +150,8 @@ luabin: # hints file could set LUATESTTARGET to this if GITSUBMODULES is defined submodules/lua/lua.h: git submodule init submodules/lua - git submodule update --remote submodules/lua + git submodule update submodules/lua +# git submodule update --remote submodules/lua # Note: many of the dependencies below are here to allow parallel make # to generate valid output diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32 index c971bdca5..8201af740 100644 --- a/sys/windows/Makefile.mingw32 +++ b/sys/windows/Makefile.mingw32 @@ -784,11 +784,13 @@ ifeq "$(GIT_AVAILABLE)" "Y" fetchlua: @if [ ! -f $(LUASRC)/lua.h ] ; then \ git submodule init ../submodules/lua && \ - git submodule update --remote ../submodules/lua ; fi + git submodule update ../submodules/lua ; fi +# git submodule update --remote ../submodules/lua ; fi fetchpdcurses: @if [ ! -f $(PDCURSES_TOP)/curses.h ] ; then \ git submodule init ../submodules/$(PDCURSES) && \ - git submodule update --remote ../submodules/$(PDCURSES) ; fi + git submodule update ../submodules/$(PDCURSES) ; fi +# git submodule update --remote ../submodules/$(PDCURSES) ; fi else # GIT_AVAILABLE no CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUADST=lua-5.4.6.tar.gz diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index 42fe44d62..4c84f5917 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -1372,12 +1372,14 @@ install: envchk.tag libdir.tag ottydir.tag outldir.tag \ !IF "$(GIT_AVAILABLE)" == "Y" $(LUASRC)\lua.h: git submodule init ../submodules/lua - git submodule update --remote ../submodules/lua + git submodule update ../submodules/lua +# git submodule update --remote ../submodules/lua # #aka PDCDEP $(PDCURSES_TOP)\curses.h: git submodule init ../submodules/$(PDCDIST) - git submodule update --remote ../submodules/$(PDCDIST) + git submodule update ../submodules/$(PDCDIST) +# git submodule update --remote ../submodules/$(PDCDIST) !ELSE # GIT_AVAILABLE no CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz