diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-06-27 23:40:59 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-07-27 21:57:12 +0300 |
| commit | c27cac4e4fd4ce125055567d65cd71fba6e4edbe (patch) | |
| tree | 882b6ad9b5273735e400740e6ce8424658c52088 /Makefile | |
| parent | 8940ec074b58925d5dfb6f50801abbb078c42212 (diff) | |
Makefile: Remove Git v2.40 configuration
Now Git v2.41 is the default, remove Makefile configuration to build and
install Git v2.40.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -128,8 +128,6 @@ GIT_EXECUTABLES += git-http-backend ## WITH_BUNDLED_GIT=YesPlease. Can be set to an arbitrary Git revision with ## tags, branches, and commit ids. GIT_VERSION ?= -## The Git version used for bundled Git v2.40. -GIT_VERSION_2_40 ?= v2.40.1.gl2 ## The Git version used for bundled Git v2.41. GIT_VERSION_2_41 ?= v2.41.0.gl1 @@ -323,15 +321,13 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.40 build-bundled-git-v2.41 -build-bundled-git-v2.40: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.40,${GIT_EXECUTABLES}) +build-bundled-git: build-bundled-git-v2.41 build-bundled-git-v2.41: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.41,${GIT_EXECUTABLES}) .PHONY: install-bundled-git ## Install bundled Git binaries. The target directory can be modified by ## setting PREFIX and DESTDIR. -install-bundled-git: install-bundled-git-v2.40 install-bundled-git-v2.41 -install-bundled-git-v2.40: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.40,${GIT_EXECUTABLES}) +install-bundled-git: install-bundled-git-v2.41 install-bundled-git-v2.41: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.41,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT @@ -579,10 +575,6 @@ ${DEPENDENCY_DIR}/git-distribution/git: ${DEPENDENCY_DIR}/git-distribution/Makef ${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "$(<D)" -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} ${Q}touch $@ -${BUILD_DIR}/bin/gitaly-%-v2.40: override GIT_VERSION = ${GIT_VERSION_2_40} -${BUILD_DIR}/bin/gitaly-%-v2.40: ${DEPENDENCY_DIR}/git-v2.40/% | ${BUILD_DIR}/bin - ${Q}install $< $@ - ${BUILD_DIR}/bin/gitaly-%-v2.41: override GIT_VERSION = ${GIT_VERSION_2_41} ${BUILD_DIR}/bin/gitaly-%-v2.41: ${DEPENDENCY_DIR}/git-v2.41/% | ${BUILD_DIR}/bin ${Q}install $< $@ |