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.
This commit is contained in:
nhmall
2023-07-03 11:27:40 -04:00
parent 2d6d151b28
commit 81dedbe298
3 changed files with 10 additions and 5 deletions
+2 -1
View File
@@ -150,7 +150,8 @@ luabin:
# hints file could set LUATESTTARGET to this if GITSUBMODULES is defined # hints file could set LUATESTTARGET to this if GITSUBMODULES is defined
submodules/lua/lua.h: submodules/lua/lua.h:
git submodule init submodules/lua 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 # Note: many of the dependencies below are here to allow parallel make
# to generate valid output # to generate valid output
+4 -2
View File
@@ -784,11 +784,13 @@ ifeq "$(GIT_AVAILABLE)" "Y"
fetchlua: fetchlua:
@if [ ! -f $(LUASRC)/lua.h ] ; then \ @if [ ! -f $(LUASRC)/lua.h ] ; then \
git submodule init ../submodules/lua && \ 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: fetchpdcurses:
@if [ ! -f $(PDCURSES_TOP)/curses.h ] ; then \ @if [ ! -f $(PDCURSES_TOP)/curses.h ] ; then \
git submodule init ../submodules/$(PDCURSES) && \ 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 else # GIT_AVAILABLE no
CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz
CURLLUADST=lua-5.4.6.tar.gz CURLLUADST=lua-5.4.6.tar.gz
+4 -2
View File
@@ -1372,12 +1372,14 @@ install: envchk.tag libdir.tag ottydir.tag outldir.tag \
!IF "$(GIT_AVAILABLE)" == "Y" !IF "$(GIT_AVAILABLE)" == "Y"
$(LUASRC)\lua.h: $(LUASRC)\lua.h:
git submodule init ../submodules/lua git submodule init ../submodules/lua
git submodule update --remote ../submodules/lua git submodule update ../submodules/lua
# git submodule update --remote ../submodules/lua
# #
#aka PDCDEP #aka PDCDEP
$(PDCURSES_TOP)\curses.h: $(PDCURSES_TOP)\curses.h:
git submodule init ../submodules/$(PDCDIST) 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 !ELSE # GIT_AVAILABLE no
CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz