mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
ab2a918b0d
Changes: https://about.gitlab.com/releases/2025/03/20/gitlab-17-10-released/ Please follow upgrade manual: https://gitlab.com/mfechner/freebsd-gitlab-docu/-/blob/master/update/17.9-17.10-freebsd.md
94 lines
4.7 KiB
Text
94 lines
4.7 KiB
Text
--- Makefile.orig 2025-03-19 10:31:26 UTC
|
|
+++ Makefile
|
|
@@ -152,7 +152,7 @@ GIT_VERSION_2_47 ?= v2.47.2
|
|
# 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
|
|
#
|
|
# 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
|
|
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}))
|
|
|
|
# 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
|
|
|
|
.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-v2.48: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.48,${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-v2.48: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.48,${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 $< $@
|
|
|
|
-${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
|
|
|
|
-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.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
|
|
# 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
|
|
- ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}"
|
|
- ${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL}
|
|
- ${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags
|
|
- ${Q}${GIT} -C "${@D}" fetch --depth 1 ${GIT_QUIET} origin ${GIT_VERSION}
|
|
- ${Q}${GIT} -C "${@D}" reset --hard
|
|
- ${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD
|
|
+ #${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}"
|
|
+ #${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL}
|
|
+ #${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags
|
|
+ #${Q}${GIT} -C "${@D}" fetch --depth 1 ${GIT_QUIET} origin ${GIT_VERSION}
|
|
+ #${Q}${GIT} -C "${@D}" reset --hard
|
|
+ #${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD
|
|
ifeq ($(OVERRIDE_GIT_VERSION),)
|
|
${Q}rm -f "${@D}"/version
|
|
else
|