From e7393a20ac0c23a2375b26645ab1724ef6e3e601 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Fri, 12 Apr 2019 11:17:59 +0000 Subject: [PATCH] MFH: r498360 Changed the build order that the port also works with bundler version 2. Approved by: ports-secteam (joneum) --- devel/gitaly/Makefile | 3 +-- devel/gitaly/files/patch-__support_makegen.go | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index a0d9c4eebb47..5c9351059bd2 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -2,6 +2,7 @@ PORTNAME= gitaly DISTVERSION= 1.27.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -27,11 +28,9 @@ MY_DEPENDS= git>=2.18:devel/git \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf - BUILD_DEPENDS= go>=1.10:lang/go \ gem:devel/ruby-gems \ ${MY_DEPENDS} - RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=6.0.4:devel/gitlab-shell diff --git a/devel/gitaly/files/patch-__support_makegen.go b/devel/gitaly/files/patch-__support_makegen.go index a0fe22c51af3..463391135c1e 100644 --- a/devel/gitaly/files/patch-__support_makegen.go +++ b/devel/gitaly/files/patch-__support_makegen.go @@ -1,4 +1,4 @@ ---- _support/makegen.go.orig 2019-03-11 20:46:03 UTC +--- _support/makegen.go.orig 2019-03-25 09:02:26 UTC +++ _support/makegen.go @@ -253,7 +253,7 @@ var templateText = ` # These variables may be overriden at runtime by top-level make @@ -9,12 +9,13 @@ ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly BUILD_TAGS := tracer_static tracer_static_jaeger -@@ -274,7 +274,7 @@ build: ../.ruby-bundle +@@ -273,8 +273,8 @@ build: ../.ruby-bundle + # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile ++ cd {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS) cd {{ .GitalyRubyDir }} && bundle config # for debugging - cd {{ .GitalyRubyDir }} && bundle install $(BUNDLE_FLAGS) -+ cd {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS) cd {{ .GitalyRubyDir }} && bundle show gitaly-proto # sanity check touch $@