Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Apr 2019 07:54:53 -0500
From:      Dmitri Goutnik <dg@syrec.org>
To:        Julien Laffaye <jlaffaye@freebsd.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r499797 - head/lang/go
Message-ID:  <20190424125452.GA1346@xombo.localdomain>
In-Reply-To: <201904232118.x3NLIc3I029187@repo.freebsd.org>
References:  <201904232118.x3NLIc3I029187@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 19-04-23 21:18:38, Julien Laffaye wrote:
> Author: jlaffaye
> Date: Tue Apr 23 21:18:38 2019
> New Revision: 499797
> URL: https://svnweb.freebsd.org/changeset/ports/499797
> 
> Log:
>   - Update to 1.12.4
>   - Various ARM improvements [1]
>   - Disable building in qemu-user-static [1]
>   - Fix test target [1]
>   
>   PR:		221297
>   Submitted by:	Dmitri Goutnik <dg@syrec.org> [1]
> 
> Modified:
>   head/lang/go/Makefile
>   head/lang/go/distinfo
> 
> Modified: head/lang/go/Makefile
> ==============================================================================
> --- head/lang/go/Makefile	Tue Apr 23 21:15:13 2019	(r499796)
> +++ head/lang/go/Makefile	Tue Apr 23 21:18:38 2019	(r499797)
> @@ -2,12 +2,18 @@
>  # $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
>  
> @@ -40,10 +46,15 @@ GOARCH=386
>  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,13 +63,14 @@ 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 \
> @@ -71,7 +83,7 @@ do-install:
>  .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
> 
> Modified: head/lang/go/distinfo
> ==============================================================================
> --- head/lang/go/distinfo	Tue Apr 23 21:15:13 2019	(r499796)
> +++ head/lang/go/distinfo	Tue Apr 23 21:18:38 2019	(r499797)
> @@ -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
> _______________________________________________
> svn-ports-all@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Thanks for committing. Could you please also commit the corresponding go.mk 
change https://reviews.freebsd.org/D19892?

-- 
Dmitri Goutnik
dg@syrec.org



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190424125452.GA1346>