Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarthik Nayak <knayak@gitlab.com>2023-03-29 15:29:11 +0300
committerKarthik Nayak <knayak@gitlab.com>2023-03-29 15:29:11 +0300
commite38a7ab578a33847d1def4046026bc6b5ed49b6a (patch)
tree8e7f4e1a7c553217517069d168f1a3946267948c /Makefile
parentd41dacd832cc71860f8e069647b539880263392c (diff)
Makefile: Build and install Git v2.40.0
Build and install a new bundled Git version for the v2.40 release track.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cf2d2a8d8..ac1e1a7a6 100644
--- a/Makefile
+++ b/Makefile
@@ -134,6 +134,8 @@ GIT_EXECUTABLES += git-http-backend
GIT_VERSION ?=
## The Git version used for bundled Git v2.39.
GIT_VERSION_2_39 ?= v2.39.2
+## The Git version used for bundled Git v2.40.
+GIT_VERSION_2_40 ?= v2.40.0
## Skip overriding the Git version and instead use the Git version as specified
## in the Git sources. This is required when building Git from a version that
@@ -327,14 +329,16 @@ install: build
.PHONY: build-bundled-git
## Build bundled Git binaries.
-build-bundled-git: build-bundled-git-v2.39
+build-bundled-git: build-bundled-git-v2.39 build-bundled-git-v2.40
build-bundled-git-v2.39: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.39,${GIT_EXECUTABLES})
+build-bundled-git-v2.40: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.40,${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.39
+install-bundled-git: install-bundled-git-v2.39 install-bundled-git-v2.40
install-bundled-git-v2.39: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.39,${GIT_EXECUTABLES})
+install-bundled-git-v2.40: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.40,${GIT_EXECUTABLES})
ifdef WITH_BUNDLED_GIT
build: build-bundled-git
@@ -588,6 +592,10 @@ ${BUILD_DIR}/bin/gitaly-%-v2.39: override GIT_VERSION = ${GIT_VERSION_2_39}
${BUILD_DIR}/bin/gitaly-%-v2.39: ${DEPENDENCY_DIR}/git-v2.39/% | ${BUILD_DIR}/bin
${Q}install $< $@
+${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/%: ${BUILD_DIR}/intermediate/% | ${BUILD_DIR}/bin
@ # To compute a unique and deterministic value for GNU build-id, we use an
@ # intermediate binary which has a fixed build ID of "TEMP_GITALY_BUILD_ID",