Index: head/lang/go/Makefile =================================================================== --- head/lang/go/Makefile (revision 499796) +++ head/lang/go/Makefile (revision 499797) @@ -1,86 +1,98 @@ # Created by: Devon H. O'Dell # $FreeBSD$ PORTNAME= go -PORTVERSION= 1.12.2 +PORTVERSION= 1.12.4 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 \ + 0bd101cecc5458a8463b8d672bf1745c3cbb7c02.patch:-p1 \ + a6e892d26d6ee59799f55bc50521605ebf75ea67.patch:-p1 + MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Go programming language LICENSE= BSD3CLAUSE BUILD_DEPENDS= go14>=1.4:lang/go14 USES= shebangfix SHEBANG_LANG= sh perl SHEBANG_FILES= misc/benchcmp \ misc/nacl/go_nacl_*_exec \ misc/wasm/go_js_wasm_exec \ src/net/http/cgi/testdata/test.cgi SHEBANG_GLOB= *.bash *.pl *.sh sh_OLD_CMD= /bin/bash "/usr/bin/env bash" sh_CMD= ${SH} WRKSRC= ${WRKDIR}/go ONLY_FOR_ARCHS= i386 amd64 armv6 armv7 OPTIONS_DEFINE_i386= GO387 GO387_DESC= Do not generate code with SSE2 (for old x86 CPU) .include .if ${ARCH} == i386 GOARCH=386 .elif ${ARCH} == "amd64" 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 PLIST_SUB+= opsys_ARCH=${OPSYS:tl}_${GOARCH} 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 && \ 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 \ ${WRKSRC}/pkg/${OPSYS:tl}_${GOARCH}/cmd do-install: @${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX} .for f in go gofmt @${LN} -sf ../go/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} .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 .for command in go gofmt ${ECHO_CMD} bin/${command} >> ${WRKDIR}/pkg-plist .endfor cd ${WRKDIR} && ${FIND} go -type f | \ ${SED} -e "s/\/${OPSYS:tl}_${GOARCH}\//\/%%opsys_ARCH%%\//g" | \ ${SORT} >> ${WRKDIR}/pkg-plist ${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist .include Index: head/lang/go/distinfo =================================================================== --- head/lang/go/distinfo (revision 499796) +++ head/lang/go/distinfo (revision 499797) @@ -1,3 +1,9 @@ -TIMESTAMP = 1554573274 -SHA256 (go1.12.2.src.tar.gz) = af992580a4a609309c734d46fd4374fe3095961263e609d9b017e2dffc3b7b58 -SIZE (go1.12.2.src.tar.gz) = 21965624 +TIMESTAMP = 1556053889 +SHA256 (go1.12.4.src.tar.gz) = 4affc3e610cd8182c47abbc5b0c0e4e3c6a2b945b55aaa2ba952964ad9df1467 +SIZE (go1.12.4.src.tar.gz) = 21965966 +SHA256 (3b6216ed0601c81fe42c2a4738d419afccb62163.patch) = 87ccfc01b285ba5c4913f91e8b475b0a0ae713cc569746461c14bf37300dae5b +SIZE (3b6216ed0601c81fe42c2a4738d419afccb62163.patch) = 2293 +SHA256 (0bd101cecc5458a8463b8d672bf1745c3cbb7c02.patch) = e4459691f5536497945534a7b9575f3c47a619bf569c32dda2dd92fe23c67792 +SIZE (0bd101cecc5458a8463b8d672bf1745c3cbb7c02.patch) = 939 +SHA256 (a6e892d26d6ee59799f55bc50521605ebf75ea67.patch) = 5588690dffa1915c30fb8f35b0e76e3d1454f1658748b0b9e6f5e17dd0b8b5fd +SIZE (a6e892d26d6ee59799f55bc50521605ebf75ea67.patch) = 1117