linux/gentoo-overlay
1
1
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity Actions

it compiles!!!

Browse source
This commit is contained in:
Manuel Friedli 2018-02-09 02:47:24 +01:00
parent 7d3995dae8
commit 7a457ed31e
4 changed files with 150 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch Normal file
View file

@ -0,0 +1,18 @@
diff --git a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk
index 309083f..b9f3bc1 100644
--- a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk
+++ b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk
@@ -1,12 +1,6 @@
-REVISION := $(shell git rev-parse --short HEAD || echo unknown)
-LAST_TAG := $(shell git describe --tags --abbrev=0)
-COMMITS := $(shell echo `git log --oneline $(LAST_TAG)..HEAD | wc -l`)
+REVISION := @@REVISION@@
VERSION := $(shell cat VERSION)
-ifneq (v$(VERSION),$(LAST_TAG))
- VERSION := $(shell echo $(VERSION)~beta.$(COMMITS).g$(REVISION))
-endif
-
VERSION_FLAGS := -ldflags='-X "main.Version=$(VERSION)" -X "main.REVISION=$(REVISION)"'
# cd into the GOPATH to workaround ./... not following symlinks