diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-03-31 15:49:59 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-03-31 15:55:58 +0300 |
| commit | 1c1cd05ae4f99428f4091e31335a73b4f27d7b05 (patch) | |
| tree | 5e7d3eb9f4de3b20a6d2b7b9264980dda909d5a3 | |
| parent | 3f6d4ca0f9af93f647810c2bcd36d9e64be32832 (diff) | |
Makefile: Explicitly override Git variables for old bundled Git
For the old bundled Git version we're not overriding the variables
`GIT_VERSION`, `GIT_PATCHES` et al, but instead we were simply reusing
those defined at the global scope. But given that the default version of
our Git distribution is about to change this doesn't work anymore.
Explicitly override the version of bundled Git to prepare for this
change.
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -568,7 +568,10 @@ ${GIT_PREFIX}/bin/git: ${DEPENDENCY_DIR}/git-${GIT_VERSION}.${GIT_EXTRA_VERSION} ${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "$(<D)" -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} install ${Q}touch $@ -${BUILD_DIR}/bin/gitaly-%: ${DEPENDENCY_DIR}/git-${GIT_VERSION}.${GIT_EXTRA_VERSION}/% | ${BUILD_DIR}/bin +${BUILD_DIR}/bin/gitaly-%: override GIT_PATCHES := $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.33.1.gl3/*) +${BUILD_DIR}/bin/gitaly-%: override GIT_VERSION = v2.33.1 +${BUILD_DIR}/bin/gitaly-%: override GIT_EXTRA_VERSION = gl3 +${BUILD_DIR}/bin/gitaly-%: ${DEPENDENCY_DIR}/git-v2.33.1.gl3/% | ${BUILD_DIR}/bin ${Q}install $< $@ ${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1: override GIT_PATCHES := $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.35.1.gl1/*) |