Add fix for Go 1.16 update. Also disable the style check which wants to download

stuff during build.
This commit is contained in:
abieber 2021-02-20 15:00:18 +00:00
parent aa27ea526a
commit 9c70511f1c
2 changed files with 20 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.93 2021/02/19 15:09:30 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.94 2021/02/20 15:00:18 abieber Exp $
# i386: pty_openbsd.go:24:10: undefined: ptmget
ONLY_FOR_ARCHS= amd64
@ -8,6 +8,7 @@ COMMENT= AWS SSM agent
GH_TAGNAME= 3.0.755.0
GH_ACCOUNT= aws
GH_PROJECT= amazon-ssm-agent
REVISION= 0
CATEGORIES= sysutils
@ -24,7 +25,7 @@ NO_TEST= Yes
ALL_TARGET= build-openbsd
USE_GMAKE= Yes
MAKE_ENV= SKIP_CHECKSTYLE=Yes GOCACHE=${WRKDIR}/go-cache
MAKE_ENV= SKIP_CHECKSTYLE=Yes GOCACHE=${WRKDIR}/go-cache GO111MODULE=off
MAKE_FILE= makefile
WRKSRC= ${WRKDIR}/src/github.com/aws/amazon-ssm-agent

View File

@ -1,9 +1,17 @@
$OpenBSD: patch-makefile,v 1.22 2021/01/27 12:17:34 ajacoutot Exp $
$OpenBSD: patch-makefile,v 1.23 2021/02/20 15:00:18 abieber Exp $
Index: makefile
--- makefile.orig
+++ makefile
@@ -25,7 +25,7 @@ coverage:: build-linux
@@ -18,14 +18,14 @@ export GO_SPACE
checkstyle::
# Run checkstyle script
- $(GO_SPACE)/Tools/src/checkstyle.sh
+ echo "Stylin"
coverage:: build-linux
$(GO_SPACE)/Tools/src/coverage.sh \
github.com/aws/amazon-ssm-agent/agent/... \
github.com/aws/amazon-ssm-agent/core/...
@ -34,3 +42,10 @@ Index: makefile
.PHONY: build-darwin
build-darwin: GOARCH=amd64
@@ -421,4 +429,4 @@ build-tests-windows: copy-src copy-tests-src pre-build
.PHONY: gen-report
gen-report:
- $(GO_SPACE)/Tools/src/gen-report.sh
\ No newline at end of file
+ $(GO_SPACE)/Tools/src/gen-report.sh