diff options
| author | Toon Claes <toon@gitlab.com> | 2024-01-19 14:20:00 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2024-01-19 14:22:25 +0300 |
| commit | 2f955d375f1a58dcedfee56f7635507ef3fac565 (patch) | |
| tree | acf6c062b30fd27858d04ae9e45acc39dd3d04b4 | |
| parent | 3e262864c8830120d83f35d029f88b03b1a9df03 (diff) | |
Makefile: Stop compiling and installing Git v2.42
In previous commit we've dropped all use of Git v2.42, so now we can
stop building it.
| -rw-r--r-- | Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -126,8 +126,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.42. -GIT_VERSION_2_42 ?= v2.42.0 ## The Git version used for bundled Git v2.43. GIT_VERSION_2_43 ?= v2.43.0 @@ -139,7 +137,7 @@ SKIP_OVERRIDING_GIT_VERSION ?= # The default version is used in case the caller does not set the variable or # if it is either set to the empty string or "default". ifeq (${GIT_VERSION:default=},) - override GIT_VERSION := ${GIT_VERSION_2_42} + override GIT_VERSION := ${GIT_VERSION_2_43} else # Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab # use both. @@ -284,15 +282,13 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.42 build-bundled-git-v2.43 -build-bundled-git-v2.42: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.42,${GIT_EXECUTABLES}) +build-bundled-git: build-bundled-git-v2.43 build-bundled-git-v2.43: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.43,${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.42 install-bundled-git-v2.43 -install-bundled-git-v2.42: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.42,${GIT_EXECUTABLES}) +install-bundled-git: install-bundled-git-v2.43 install-bundled-git-v2.43: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.43,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT @@ -537,10 +533,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.42: override GIT_VERSION = ${GIT_VERSION_2_42} -${BUILD_DIR}/bin/gitaly-%-v2.42: ${DEPENDENCY_DIR}/git-v2.42/% | ${BUILD_DIR}/bin - ${Q}install $< $@ - ${BUILD_DIR}/bin/gitaly-%-v2.43: override GIT_VERSION = ${GIT_VERSION_2_43} ${BUILD_DIR}/bin/gitaly-%-v2.43: ${DEPENDENCY_DIR}/git-v2.43/% | ${BUILD_DIR}/bin ${Q}install $< $@ |