Attachment #198063 for bug #232203

View | Details | Raw Unified | Return to bug 232203
Collapse All | Expand All





PORTNAME=	nomad
DISTVERSIONPREFIX=	v
DISTVERSION=	0.8.6
CATEGORIES=	sysutils

MAINTAINER=	jhixson@FreeBSD.org

LICENSE=	MPL20
LICENSE_FILE=	${WRKSRC}/LICENSE

BROKEN=		fails to build
ONLY_FOR_ARCHS=	amd64
ONLY_FOR_ARCHS_REASON=	On i386: go compiler crashes: https://github.com/golang/go/issues/23763



USES=		compiler
USE_GITHUB=	yes
GH_ACCOUNT=	hashicorp golang:sys
GH_PROJECT=	sys:sys
GH_TAGNAME=	fa43e7bc11b:sys
GH_SUBDIR=	src/github.com/hashicorp/nomad
USE_RC_SUBR=	nomad

USERS=		nomad
GROUPS=		nomad

post-patch:
	${MV} ${WRKSRC_sys}/cpu ${WRKSRC}/vendor/golang.org/x/sys

do-build:
	@cd ${WRKSRC}/src/github.com/hashicorp/nomad && \
		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \

Lines 1-3 Link Here

(-)sysutils/nomad/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1528902197	1	TIMESTAMP = 1539347602
2	SHA256 (hashicorp-nomad-v0.8.4_GH0.tar.gz) = 8dfacd578f2be1ae6cc7af6b2749952f1646344cb95bde17f35eeb78faacd616	2	SHA256 (hashicorp-nomad-v0.8.6_GH0.tar.gz) = e69b447dcc2caeb3d5ecf904cf3c8f327a5185a84442ee4241a796d89f96e143
3	SIZE (hashicorp-nomad-v0.8.4_GH0.tar.gz) = 69733288	3	SIZE (hashicorp-nomad-v0.8.6_GH0.tar.gz) = 69730280
		4	SHA256 (golang-sys-fa43e7bc11b_GH0.tar.gz) = 085dd1dbc2865751cea75649dd59608bd0d0873ae852fda587b7d089734266f9
		5	SIZE (golang-sys-fa43e7bc11b_GH0.tar.gz) = 1093021




--- vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go.orig	2018-10-12 12:40:06 UTC
+++ vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
@@ -6,20 +6,13 @@
 
 package blake2b
 
+import "golang.org/x/sys/cpu"
+
 func init() {
-	useAVX2 = supportsAVX2()
-	useAVX = supportsAVX()
-	useSSE4 = supportsSSE4()
+	useAVX2 = cpu.X86.HasAVX2
+	useAVX = cpu.X86.HasAVX
+	useSSE4 = cpu.X86.HasSSE41
 }
-
-//go:noescape
-func supportsSSE4() bool
-
-//go:noescape
-func supportsAVX() bool
-
-//go:noescape
-func supportsAVX2() bool
 
 //go:noescape
 func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)




--- vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s.orig	2018-10-12 12:41:53 UTC
+++ vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s
@@ -748,15 +748,3 @@ noinc:
 
 	MOVQ BP, SP
 	RET
-
-// func supportsAVX2() bool
-TEXT ·supportsAVX2(SB), 4, $0-1
-	MOVQ runtime·support_avx2(SB), AX
-	MOVB AX, ret+0(FP)
-	RET
-
-// func supportsAVX() bool
-TEXT ·supportsAVX(SB), 4, $0-1
-	MOVQ runtime·support_avx(SB), AX
-	MOVB AX, ret+0(FP)
-	RET




--- vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go.orig	2018-10-12 12:39:07 UTC
+++ vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go
@@ -6,12 +6,11 @@
 
 package blake2b
 
+import "golang.org/x/sys/cpu"
+
 func init() {
-	useSSE4 = supportsSSE4()
+	useSSE4 = cpu.X86.HasSSE41
 }
-
-//go:noescape
-func supportsSSE4() bool
 
 //go:noescape
 func hashBlocksSSE4(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)




--- vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s.orig	2018-10-12 12:43:05 UTC
+++ vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s
@@ -279,12 +279,3 @@ noinc:
 
 	MOVQ BP, SP
 	RET
-
-// func supportsSSE4() bool
-TEXT ·supportsSSE4(SB), 4, $0-1
-	MOVL $1, AX
-	CPUID
-	SHRL $19, CX  // Bit 19 indicates SSE4 support
-	ANDL $1, CX  // CX != 0 if support SSE4
-	MOVB CX, ret+0(FP)
-	RET

Added Link Here

(-)sysutils/nomad/files/patch-vendor_vendor.json (+10 lines)
1	--- vendor/vendor.json.orig 2018-10-12 12:46:48 UTC
2	+++ vendor/vendor.json
3	@@ -316,6 +316,7 @@
4	{"path":"golang.org/x/net/lex/httplex","checksumSHA1":"3xyuaSNmClqG4YWC7g0isQIbUTc=","revision":"ab5485076ff3407ad2d02db054635913f017b0ed","revisionTime":"2017-07-19T21:11:51Z"},
5	{"path":"golang.org/x/net/trace","checksumSHA1":"u/r66lwYfgg682u5hZG7/E7+VCY=","revision":"ab5485076ff3407ad2d02db054635913f017b0ed","revisionTime":"2017-07-19T21:11:51Z"},
6	{"path":"golang.org/x/sync/errgroup","checksumSHA1":"S0DP7Pn7sZUmXc55IzZnNvERu6s=","revision":"316e794f7b5e3df4e95175a45a5fb8b12f85cb4f","revisionTime":"2016-07-15T18:54:39Z"},
7	+ {"path":"golang.org/x/sys/cpu","revision":"fa43e7bc11baaae89f3f902b2b4d832b68234844"},
8	{"path":"golang.org/x/sys/unix","checksumSHA1":"SIhhNXud9FKua0s3WlGPRRkDKRg=","revision":"8b4580aae2a0dd0c231a45d3ccb8434ff533b840","revisionTime":"2017-11-30T16:26:51Z"},
9	{"path":"golang.org/x/sys/windows","checksumSHA1":"riTVymIu2BFphV6UlA73Fn9tmmU=","revision":"8b4580aae2a0dd0c231a45d3ccb8434ff533b840","revisionTime":"2017-11-30T16:26:51Z"},
10	{"path":"golang.org/x/text/encoding","checksumSHA1":"Mr4ur60bgQJnQFfJY0dGtwWwMPE=","revision":"e113a52b01bdd1744681b6ce70c2e3d26b58d389","revisionTime":"2017-08-30T18:54:29Z"},

Return to bug 232203

Lines 2-8 Link Here

(-)sysutils/nomad/Makefile (-3 / +7 lines)
2		2
3	PORTNAME= nomad	3	PORTNAME= nomad
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.8.4	5	DISTVERSION= 0.8.6
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7		7
8	MAINTAINER= jhixson@FreeBSD.org	8	MAINTAINER= jhixson@FreeBSD.org
Lines 11-17 COMMENT= Cluster manager and scheduler Link Here
11	LICENSE= MPL20	11	LICENSE= MPL20
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	BROKEN= fails to build
15	ONLY_FOR_ARCHS= amd64	14	ONLY_FOR_ARCHS= amd64
16	ONLY_FOR_ARCHS_REASON= On i386: go compiler crashes: https://github.com/golang/go/issues/23763	15	ONLY_FOR_ARCHS_REASON= On i386: go compiler crashes: https://github.com/golang/go/issues/23763
17		16
Lines 19-31 BUILD_DEPENDS= go:lang/go Link Here
19		18
20	USES= compiler	19	USES= compiler
21	USE_GITHUB= yes	20	USE_GITHUB= yes
22	GH_ACCOUNT= hashicorp	21	GH_ACCOUNT= hashicorp golang:sys
		22	GH_PROJECT= sys:sys
		23	GH_TAGNAME= fa43e7bc11b:sys
23	GH_SUBDIR= src/github.com/hashicorp/nomad	24	GH_SUBDIR= src/github.com/hashicorp/nomad
24	USE_RC_SUBR= nomad	25	USE_RC_SUBR= nomad
25		26
26	USERS= nomad	27	USERS= nomad
27	GROUPS= nomad	28	GROUPS= nomad
28		29
		30	post-patch:
		31	${MV} ${WRKSRC_sys}/cpu ${WRKSRC}/vendor/golang.org/x/sys
		32
29	do-build:	33	do-build:
30	@cd ${WRKSRC}/src/github.com/hashicorp/nomad && \	34	@cd ${WRKSRC}/src/github.com/hashicorp/nomad && \
31	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \	35	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \

Added Link Here

(-)sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go (+28 lines)
1	--- vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go.orig 2018-10-12 12:40:06 UTC
2	+++ vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
3	@@ -6,20 +6,13 @@
4
5	package blake2b
6
7	+import "golang.org/x/sys/cpu"
8	+
9	func init() {
10	- useAVX2 = supportsAVX2()
11	- useAVX = supportsAVX()
12	- useSSE4 = supportsSSE4()
13	+ useAVX2 = cpu.X86.HasAVX2
14	+ useAVX = cpu.X86.HasAVX
15	+ useSSE4 = cpu.X86.HasSSE41
16	}
17	-
18	-//go:noescape
19	-func supportsSSE4() bool
20	-
21	-//go:noescape
22	-func supportsAVX() bool
23	-
24	-//go:noescape
25	-func supportsAVX2() bool
26
27	//go:noescape
28	func hashBlocksAVX2(h [8]uint64, c [2]uint64, flag uint64, blocks []byte)