From 9b03a12aa39488d5350c71640f3e2e3feabccc0b Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Tue, 18 Dec 2018 15:20:21 +0000 Subject: Forced linking of bin/sh and verbose Make in Git While checking the build of the previous commit, a failure happened when linking `reproduce/build/dependencies/installed/bin/sh' with the built Bash (because the symbolic link already existed!). So a `-f' flag was added to `ln' to just change it without complaining. I also noticed that the Git build was also not in verbose mode. So this has also been corrected. --- reproduce/src/make/dependencies-basic.mk | 2 +- reproduce/src/make/dependencies.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'reproduce/src/make') diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index 70a9c68..8717656 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -451,7 +451,7 @@ endif # Just to be sure that the installation step above went well, # before making the link, we'll see if the file actually exists # there. - if [ -f $@ ]; then ln -s $@ $(ibdir)/sh; fi + if [ -f $@ ]; then ln -fs $@ $(ibdir)/sh; fi diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 2b5a118..6a8e18e 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -318,8 +318,9 @@ $(ibdir)/flock: $(tdir)/flock-$(flock-version).tar.xz $(call gbuild, $<, flock-$(flock-version), static) $(ibdir)/git: $(tdir)/git-$(git-version).tar.xz - $(call gbuild, $<, git-$(git-version), static, \ - --without-tcltk --with-shell=$(ibdir)/bash) + $(call gbuild, $<, git-$(git-version), static, \ + --without-tcltk --with-shell=$(ibdir)/bash, \ + V=1) # The order of dependencies is based on how long they take to build (how # large they are): Libgit2 depends on CMake which takes a VERY long time to -- cgit v1.2.1