diff options
Diffstat (limited to 'devel/gitaly/files/patch-Makefile')
| -rw-r--r-- | devel/gitaly/files/patch-Makefile | 80 |
1 files changed, 38 insertions, 42 deletions
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index 6fb9b785f001..6c6e353e2a30 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,79 +1,75 @@ ---- Makefile.orig 2025-03-19 10:31:26 UTC +--- Makefile.orig 2025-04-16 03:58:04 UTC +++ Makefile -@@ -152,7 +152,7 @@ GIT_VERSION_2_47 ?= v2.47.2 +@@ -151,7 +151,7 @@ GIT_VERSION ?= + # GIT_VERSION_x_xx defines versions for each instance of bundled Git we ship. When a new # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets, # and add new targets under the "# These targets build specific releases of Git." section. - GIT_VERSION_2_47 ?= v2.47.2 -GIT_VERSION_2_48 ?= v2.48.1.gl1 +#GIT_VERSION_2_48 ?= v2.48.1.gl1 + GIT_VERSION_2_49 ?= v2.49.0.gl1 # # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the - # `git --version` command. This affects bundled and non-bundled Git, and can be used whenever -@@ -247,8 +247,7 @@ BUILD_GEM_NAME ?= gitaly +@@ -163,7 +163,7 @@ ifeq (${GIT_VERSION:default=},) + ifeq (${GIT_VERSION:default=},) + # GIT_VERSION should be overridden to the default version of bundled Git. This is only + # necessary until https://gitlab.com/gitlab-org/gitaly/-/issues/6195 is complete. +- override GIT_VERSION := ${GIT_VERSION_2_48} ++ override GIT_VERSION := ${GIT_VERSION_2_49} + # When GIT_VERSION is not explicitly set, we default to bundled Git. + export WITH_BUNDLED_GIT = YesPlease + else +@@ -259,8 +259,7 @@ BUILD_GEM_NAME ?= gitaly BUILD_GEM_NAME ?= gitaly # Git binaries that are eventually embedded into the Gitaly binary. --GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.47, ${GIT_EXECUTABLES})) \ -- $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.48, ${GIT_EXECUTABLES})) -+GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.47, ${GIT_EXECUTABLES})) +-GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.48, ${GIT_EXECUTABLES})) \ +- $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES})) ++GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES})) # All executables provided by Gitaly. GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print))) -@@ -337,16 +336,14 @@ install: build +@@ -349,15 +348,13 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. --build-bundled-git: build-bundled-git-v2.47 build-bundled-git-v2.48 -+build-bundled-git: build-bundled-git-v2.47 - build-bundled-git-v2.47: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.47,${GIT_EXECUTABLES}) +-build-bundled-git: build-bundled-git-v2.48 build-bundled-git-v2.49 -build-bundled-git-v2.48: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.48,${GIT_EXECUTABLES}) ++build-bundled-git: build-bundled-git-v2.49 + build-bundled-git-v2.49: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.49,${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.47 install-bundled-git-v2.48 -+install-bundled-git: install-bundled-git-v2.47 - install-bundled-git-v2.47: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.47,${GIT_EXECUTABLES}) +-install-bundled-git: install-bundled-git-v2.48 install-bundled-git-v2.49 -install-bundled-git-v2.48: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.48,${GIT_EXECUTABLES}) ++install-bundled-git: install-bundled-git-v2.49 + install-bundled-git-v2.49: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.49,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT - build: build-bundled-git -@@ -631,22 +628,22 @@ ${BUILD_DIR}/bin/gitaly-%-v2.47: ${DEPENDENCY_DIR}/git - ${BUILD_DIR}/bin/gitaly-%-v2.47: ${DEPENDENCY_DIR}/git-v2.47/% | ${BUILD_DIR}/bin - ${Q}install $< $@ +@@ -679,17 +676,17 @@ ${DEPENDENCY_DIR}/git-distribution/build/git: ${DEPEND + ${Q}touch $@ + # These targets build specific releases of Git. -${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_VERSION = ${GIT_VERSION_2_48} +#${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_VERSION = ${GIT_VERSION_2_48} - # Use non-collision-detecting SHA1 implementation in non-cryptographic scenarios - # to improve performance. For now, this is only enabled for Git version 2.48 on - # Linux platforms. --ifeq ($(OS),Linux) --${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_MESON_BUILD_OPTIONS += -Dsha1_unsafe_backend=openssl --${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_BUILD_OPTIONS += OPENSSL_SHA1_UNSAFE=YesPlease --endif -+#ifeq ($(OS),Linux) -+#${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_MESON_BUILD_OPTIONS += -Dsha1_unsafe_backend=openssl -+#${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_BUILD_OPTIONS += OPENSSL_SHA1_UNSAFE=YesPlease -+#endif + ${BUILD_DIR}/bin/gitaly-%-v2.49: override GIT_VERSION = ${GIT_VERSION_2_49} --ifdef USE_MESON + ifdef USE_MESON -${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/build/% | ${BUILD_DIR}/bin - ${Q}install $< $@ --else --${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin -- ${Q}install $< $@ --endif -+#ifdef USE_MESON +#${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/build/% | ${BUILD_DIR}/bin +# ${Q}install $< $@ -+#else + ${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/build/% | ${BUILD_DIR}/bin + ${Q}install $< $@ + else +-${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin +- ${Q}install $< $@ +#${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin +# ${Q}install $< $@ -+#endif - - # clear-go-build-cache-if-needed cleans the Go build cache if it exceeds the maximum size as - # configured in GOCACHE_MAX_SIZE_KB. -@@ -680,12 +677,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi + ${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/% | ${BUILD_DIR}/bin + ${Q}install $< $@ + endif +@@ -726,12 +723,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi # otherwise try to rebuild all targets depending on it whenever we build # something else. We thus depend on the Makefile instead. ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version |