deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-05 07:13:09 +02:00
Code Issues Releases Wiki Activity

adjust godeps for multiarch builds

Browse source
This commit is contained in:
morph027 2020-12-18 19:11:55 +01:00
parent 64cccab641
commit 25b2722a4c
No known key found for this signature in database
GPG key ID: BF17A54BB873BE58
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -2,6 +2,8 @@ all: build
GO := $(shell which go) GO := $(shell which go)
GOPATH := "$(CURDIR)/vendor:$(CURDIR)" GOPATH := "$(CURDIR)/vendor:$(CURDIR)"
GOOS ?= linux
GOARCH ?= amd64
BINDIR := "$(CURDIR)/bin" BINDIR := "$(CURDIR)/bin"
VERSION := $(shell "$(CURDIR)/scripts/get-version.sh") VERSION := $(shell "$(CURDIR)/scripts/get-version.sh")
TARVERSION := $(shell "$(CURDIR)/scripts/get-version.sh" --tar) TARVERSION := $(shell "$(CURDIR)/scripts/get-version.sh" --tar)
@ -35,6 +37,12 @@ ifneq ($(COUNT),)
TESTARGS := $(TESTARGS) -count $(COUNT) TESTARGS := $(TESTARGS) -count $(COUNT)
endif endif
ifeq ($(GOARCH), amd64)
VENDORBIN := $(CURDIR)/vendor/bin
else
VENDORBIN := $(CURDIR)/vendor/bin/$(GOOS)_$(GOARCH)
endif
hook: hook:
[ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit" [ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit"
@ -46,14 +54,14 @@ easyjson: dependencies
GOPATH=$(GOPATH) $(GO) build -o ./vendor/bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go GOPATH=$(GOPATH) $(GO) build -o ./vendor/bin/easyjson ./vendor/src/github.com/mailru/easyjson/easyjson/main.go
dependencies: hook godeps dependencies: hook godeps
GOPATH=$(GOPATH) ./vendor/bin/godeps -u dependencies.tsv GOPATH=$(GOPATH) "$(VENDORBIN)/godeps" -u dependencies.tsv
dependencies.tsv: godeps dependencies.tsv: godeps
set -e ;\ set -e ;\
TMP=$$(mktemp -d) ;\ TMP=$$(mktemp -d) ;\
echo Make sure to remove $$TMP on error ;\ echo Make sure to remove $$TMP on error ;\
cp -r "$(CURDIR)/vendor" $$TMP ;\ cp -r "$(CURDIR)/vendor" $$TMP ;\
GOPATH=$$TMP/vendor:"$(CURDIR)" "$(CURDIR)/vendor/bin/godeps" ./src/... > "$(CURDIR)/dependencies.tsv" ;\ GOPATH=$$TMP/vendor:"$(CURDIR)" "$(VENDORBIN)/godeps" ./src/... > "$(CURDIR)/dependencies.tsv" ;\
rm -rf $$TMP rm -rf $$TMP
src/signaling/continentmap.go: src/signaling/continentmap.go: