--- lang/go/Makefile (revision 498803) +++ lang/go/Makefile (working copy) @@ -3,11 +3,16 @@ PORTNAME= go PORTVERSION= 1.12.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= https://golang.org/dl/ DISTNAME= go${PORTVERSION}.src +PATCH_SITES= https://github.com/golang/go/commit/ +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221297#c23 +PATCHFILES= 3b6216ed0601c81fe42c2a4738d419afccb62163.patch:-p1 + MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Go programming language @@ -40,10 +45,15 @@ GOARCH=amd64 .elif ${ARCH} == armv6 || ${ARCH} == armv7 GOARCH=arm +GOARM=${ARCH:C/armv//} .else IGNORE= unknown arch ${ARCH} .endif +.ifdef QEMU_EMULATING +IGNORE= fails to build with qemu-user-static +.endif + .if ${PORT_OPTIONS:MGO387} GO386=387 .endif @@ -52,6 +62,7 @@ post-patch: @cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete + @${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash do-build: cd ${WRKSRC}/src && \ @@ -58,7 +69,7 @@ GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \ GOROOT_BOOTSTRAP=${LOCALBASE}/go14 \ GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \ - GO386=${GO386} \ + GO386=${GO386} GOARM=${GOARM} CGO_ENABLED=1 \ ${SH} make.bash -v ${RM} -r ${WRKSRC}/pkg/obj \ ${WRKSRC}/pkg/bootstrap \ @@ -71,7 +82,7 @@ .endfor do-test: - cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${SH} run.bash --no-rebuild --banner + cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${SH} run.bash -no-rebuild -banner "" pkg-plist: stage ${RM} ${WRKDIR}/pkg-plist --- lang/go/distinfo (revision 498803) +++ lang/go/distinfo (working copy) @@ -1,3 +1,5 @@ -TIMESTAMP = 1554573274 +TIMESTAMP = 1555155727 SHA256 (go1.12.2.src.tar.gz) = af992580a4a609309c734d46fd4374fe3095961263e609d9b017e2dffc3b7b58 SIZE (go1.12.2.src.tar.gz) = 21965624 +SHA256 (3b6216ed0601c81fe42c2a4738d419afccb62163.patch) = 87ccfc01b285ba5c4913f91e8b475b0a0ae713cc569746461c14bf37300dae5b +SIZE (3b6216ed0601c81fe42c2a4738d419afccb62163.patch) = 2293