diff options
Diffstat (limited to 'devel/gitaly/files/patch-Makefile')
| -rw-r--r-- | devel/gitaly/files/patch-Makefile | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile deleted file mode 100644 index f7b0f1366353..000000000000 --- a/devel/gitaly/files/patch-Makefile +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2021-07-21 11:54:58 UTC -+++ Makefile -@@ -200,7 +200,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} - all: install - - .PHONY: build --build: ${SOURCE_DIR}/.ruby-bundle libgit2 -+build: ${SOURCE_DIR}/.ruby-bundle - go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands)) - # We use version suffix for the gitaly-git2go binary to support compatibility contract between - # gitaly and gitaly-git2go during upgrade deployment. -@@ -373,9 +373,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a - # step. Both Omnibus and CNG assume it is in the Gitaly root, not in - # _build. Hence the '../' in front. - ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile -- ${Q}cd ${GITALY_RUBY_DIR} && bundle config set --local deployment "${BUNDLE_DEPLOYMENT}" -- ${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging -- ${Q}cd ${GITALY_RUBY_DIR} && bundle install -+ ${Q}cd ${GITALY_RUBY_DIR} && rm -f Gemfile.lock && bundle install --local - ${Q}touch $@ - - ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -443,7 +441,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI - ${TOOLS_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version - ${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi - curl -o $@.tmp --silent --show-error -L ${PROTOC_URL} -- ${Q}printf '${PROTOC_HASH} $@.tmp' | sha256sum -c - -+ ${Q}printf '${PROTOC_HASH} $@.tmp' | sha256 -c - - ${Q}mv $@.tmp $@ - - ${PROTOC}: ${TOOLS_DIR}/protoc.zip |