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:
authorJustin Tobler <jtobler@gitlab.com>2023-06-02 23:40:26 +0300
committerJustin Tobler <jtobler@gitlab.com>2023-06-02 23:40:26 +0300
commit4e47140035e31b42c6bf7b1b692489f8d5e94298 (patch)
treef6632187a96102ff78b005ddac76ca06487d8c3b
parent1ed139ab2d95e27491b49fcced61d0dc99834ab2 (diff)
Makefile: Build and install Git v2.41.0
Build and install a new bundled Git version for the v2.41 release track.
-rw-r--r--Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8d13402f5..ac3258483 100644
--- a/Makefile
+++ b/Makefile
@@ -134,6 +134,8 @@ GIT_EXECUTABLES += git-http-backend
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
## 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
@@ -332,14 +334,16 @@ install: build
.PHONY: build-bundled-git
## Build bundled Git binaries.
-build-bundled-git: build-bundled-git-v2.40
+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-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: 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-v2.41: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.41,${GIT_EXECUTABLES})
ifdef WITH_BUNDLED_GIT
build: build-bundled-git
@@ -565,6 +569,10 @@ ${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 $< $@
+
${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",