From 73d0059d00d55a31ac94f169e7d99c99a4bbde82 Mon Sep 17 00:00:00 2001 From: Oleg Borodin Date: Sun, 20 Feb 2022 21:36:41 +0200 Subject: [PATCH] update go makefile --- lang/go/Makefile | 69 +++++++++++++++++++++++++++++++++++------------- lang/go/distinfo | 4 ++- 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/lang/go/Makefile b/lang/go/Makefile index 7d41251b..ee2e1f96 100644 --- a/lang/go/Makefile +++ b/lang/go/Makefile @@ -5,12 +5,38 @@ PORTNAME= go PORTVERSION= 1.17.6 CATEGORIES= lang MASTER_SITES= https://golang.org/dl/ -DISTNAME= go${PORTVERSION}.src +MASTER_SITES+= https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \ +MASTER_SITES+= LOCAL/dmgk:bootstrap +DISTFILES= go${PORTVERSION}.src.tar.gz +DISTFILES+= ${BOOTSTRAP_NAME}.tar.xz:bootstrap + +.include + + +BOOTSTRAP_NAME= go-${OPSYS:tl}-${GOARCH}${GOARM}-${BOOTSTRAP_TAG} +BOOTSTRAP_TAG= go1.14 + + +.if ${ARCH} == amd64 +GOARCH=amd64 +.elif ${ARCH} == i386 +GOARCH=386 +.elif ${ARCH} == armv6 +GOARCH=arm +GOARM=6 +.elif ${ARCH} == armv7 +GOARCH=arm +GOARM=7 +.elif ${ARCH} == aarch64 +GOARCH=arm64 +.else +IGNORE= unknown arch ${ARCH} +.endif MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Go programming language -BUILD_DEPENDS= go14>=1.4:lang/go14 +#BUILD_DEPENDS= go14>=1.4:lang/go14 RUN_DEPENDS= bash:lang/bash USES= shebangfix @@ -19,11 +45,8 @@ SHEBANG_FILES+= misc/wasm/go_js_wasm_exec SHEBANG_FILES+= src/net/http/cgi/testdata/test.cgi SHEBANG_GLOB= *.bash *.pl *.sh -SHEBANG_GLOB= *.bash *.pl *.sh - - -sh_OLD_CMD= /bin/bash "/usr/bin/env bash" -sh_CMD= ${SH} +#sh_OLD_CMD= /bin/bash "/usr/bin/env bash" +#sh_CMD= ${SH} WRKSRC= ${WRKDIR}/go ONLY_FOR_ARCHS= i386 amd64 armv6 armv7 aarch64 @@ -31,22 +54,33 @@ ONLY_FOR_ARCHS= i386 amd64 armv6 armv7 aarch64 USE_LOCALE=en_US.UTF-8 EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} - post-patch: cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete ${REINPLACE_CMD} -e 's|^if ulimit -T|false \&\& &|' ${WRKSRC}/src/run.bash -BOOTSTRAP_GO = ${LOCALBASE}/go14 -#BOOTSTRAP_GO = ${LOCALBASE}/lib/go - +#BOOTSTRAP_GO = ${LOCALBASE}/go14 +BOOTSTRAP_GO = ${WRKDIR}/${BOOTSTRAP_NAME} do-build: - cd ${WRKSRC}/src && \ - GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/lib/go \ + cd ${WRKSRC}/src ; ${SETENV} \ + XDG_CACHE_HOME=${WRKDIR} \ GOROOT_BOOTSTRAP=${BOOTSTRAP_GO} \ - GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \ - GO386=${GO386} GOARM=${GOARM} CGO_ENABLED=1 \ - ${SH} make.bash -v + GOROOT=${WRKSRC} \ + GOROOT_FINAL=${PREFIX}/go \ + GOBIN= \ + GOOS=${OPSYS:tl} \ + GOARCH=${GOARCH} \ + GO386=${GO386} \ + GOARM=${GOARM} \ + CC=${CC} \ + ${LOCALBASE}/bin/bash make.bash -v + +# cd ${WRKSRC}/src && \ +# GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/lib/go \ +# GOROOT_BOOTSTRAP=${BOOTSTRAP_GO} \ +# GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \ +# 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 @@ -63,6 +97,5 @@ do-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/go/bin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/go/pkg/tool/*/* - -.include +.include #EOF diff --git a/lang/go/distinfo b/lang/go/distinfo index 4e9e8317..83ccbe0d 100644 --- a/lang/go/distinfo +++ b/lang/go/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1641756228 +TIMESTAMP = 1645383690 SHA256 (go1.17.6.src.tar.gz) = 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 SIZE (go1.17.6.src.tar.gz) = 22191372 +SHA256 (go-freebsd-amd64-go1.14.tar.xz) = 3b259247fb228258a4f31e283e9aa23cafd590eabce334666a9e9b2ffe47c19b +SIZE (go-freebsd-amd64-go1.14.tar.xz) = 35927980