Date: Fri, 14 Feb 2020 18:06:14 +0000 (UTC) From: Dmitri Goutnik <dmgk@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526127 - head/lang/go-devel Message-ID: <202002141806.01EI6Ev5075286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dmgk Date: Fri Feb 14 18:06:14 2020 New Revision: 526127 URL: https://svnweb.freebsd.org/changeset/ports/526127 Log: lang/go-devel: Address D23151 feedback, add COMPAT_FREEBSD11 canary - Merge do-install and post-install targets - Simplify makesum target - Add COMPAT_FREEBSD11 canary introduced by lang/rust in r522968 (the rationale described in the r522968 commit message also applies to lang/go{,-devel}) Modified: head/lang/go-devel/Makefile Modified: head/lang/go-devel/Makefile ============================================================================== --- head/lang/go-devel/Makefile Fri Feb 14 16:50:23 2020 (r526126) +++ head/lang/go-devel/Makefile Fri Feb 14 18:06:14 2020 (r526127) @@ -3,6 +3,7 @@ PORTNAME= go PORTVERSION= g20200205 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \ LOCAL/dmgk:bootstrap @@ -28,7 +29,7 @@ RUN_DEPENDS_aarch64= binutils>0:devel/binutils TEST_DEPENDS= ${TEST_DEPENDS_${ARCH}} TEST_DEPENDS_aarch64= binutils>0:devel/binutils -USES= shebangfix tar:xz +USES= shebangfix USE_GITHUB= yes GH_ACCOUNT= golang @@ -37,12 +38,14 @@ GH_TAGNAME= a068054af141c01df5a4519844f4b77273605f4e SHEBANG_FILES= misc/wasm/go_js_wasm_exec \ src/net/http/cgi/testdata/test.cgi SHEBANG_GLOB= *.bash *.pl *.sh -SHEBANG_LANG= sh sh_OLD_CMD= /bin/bash "/usr/bin/env bash" sh_CMD= ${SH} CONFLICTS_INSTALL= go +# Upstream archive contains files with UTF-8 names +EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 ${TAR} + OPTIONS_DEFINE_i386= GO387 GO387_DESC= Do not generate code with SSE2 (for old x86 CPU) @@ -66,6 +69,11 @@ post-patch: # Needed only for untagged releases ${ECHO_CMD} "devel +${GH_TAGNAME}" > ${WRKSRC}/VERSION +pre-build: + # Check that the running kernel has COMPAT_FREEBSD11 required by lang/go{,-devel} post-ino64 + @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ + ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh + do-build: cd ${WRKSRC}/src ; ${SETENV} \ XDG_CACHE_HOME=${WRKDIR} \ @@ -80,21 +88,16 @@ do-build: ${SH} make.bash -v do-install: - cd ${WRKSRC} ; \ + @cd ${WRKSRC} ; \ ${RM} -r .gitattributes .gitignore .github favicon.ico robots.txt \ pkg/obj pkg/bootstrap pkg/${OPSYS:tl}_${GOARCH_${ARCH}}/cmd @${MKDIR} ${STAGEDIR}${PREFIX}/go @${CP} -a ${WRKSRC}/* ${STAGEDIR}${PREFIX}/go .for file in ${BINARIES} @${LN} -sf ../go/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file} -.endfor - -post-install: -.for file in ${BINARIES} @${ECHO_CMD} bin/${file} >> ${TMPPLIST} .endfor - @cd ${STAGEDIR}${PREFIX} && \ - ${FIND} go -type f >> ${TMPPLIST} + @cd ${STAGEDIR}${PREFIX} && ${FIND} go -type f >> ${TMPPLIST} do-test: cd ${WRKSRC}/src && ${SETENV} \ @@ -104,14 +107,14 @@ do-test: GOARCH=${GOARCH_${ARCH}} \ GO386=${GO386} \ GOARM=${GOARM_${ARCH}} \ - ${SH} run.bash + ${SH} run.bash -no-rebuild .if !defined(_GO_MAKESUM_GUARD) makesum: ${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]} ${MAKE} -D_GO_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch} - ${GREP} ${GOARCH_${arch}:U${arch}} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp + ${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp ${RM} ${DISTINFO_FILE}.${arch} .endfor ${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002141806.01EI6Ev5075286>