From owner-svn-ports-all@freebsd.org Wed Apr 24 16:25:59 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0050B159D2FD; Wed, 24 Apr 2019 16:25:58 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6A70D6D433; Wed, 24 Apr 2019 16:25:58 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CC61EBFA; Wed, 24 Apr 2019 16:25:58 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3OGPwFv040808; Wed, 24 Apr 2019 16:25:58 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from jlaffaye@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3OGPwZF040807; Wed, 24 Apr 2019 16:25:58 GMT (envelope-from jlaffaye@FreeBSD.org) Message-Id: <201904241625.x3OGPwZF040807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jlaffaye set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye Date: Wed, 24 Apr 2019 16:25:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499862 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: jlaffaye X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 499862 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6A70D6D433 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2019 16:25:59 -0000 Author: jlaffaye Date: Wed Apr 24 16:25:57 2019 New Revision: 499862 URL: https://svnweb.freebsd.org/changeset/ports/499862 Log: Improve support for ARM in go.mk - Set GOARM value according to current ARCH - Set CGO_ENABLED Submitted by: Dmitri Goutnik Differential Revision: D19892 Modified: head/Mk/Uses/go.mk Modified: head/Mk/Uses/go.mk ============================================================================== --- head/Mk/Uses/go.mk Wed Apr 24 16:17:29 2019 (r499861) +++ head/Mk/Uses/go.mk Wed Apr 24 16:25:57 2019 (r499862) @@ -55,15 +55,21 @@ GO_PKGNAME= ${PORTNAME} .endif GO_TARGET?= ${GO_PKGNAME} GO_BUILDFLAGS+= -v -buildmode=exe +CGO_ENABLED?= 1 CGO_CFLAGS+= -I${LOCALBASE}/include CGO_LDFLAGS+= -L${LOCALBASE}/lib +.if ${ARCH} == armv6 || ${ARCH} == armv7 +GOARM?= ${ARCH:C/armv//} +.endif # Read-only variables GO_CMD= ${LOCALBASE}/bin/go GO_WRKDIR_BIN= ${WRKDIR}/bin -GO_ENV+= CGO_CFLAGS="${CGO_CFLAGS}" \ - CGO_LDFLAGS="${CGO_LDFLAGS}" +GO_ENV+= CGO_ENABLED=${CGO_ENABLED} \ + CGO_CFLAGS="${CGO_CFLAGS}" \ + CGO_LDFLAGS="${CGO_LDFLAGS}" \ + GOARM=${GOARM} .if ${go_ARGS:Mmodules} GO_BUILDFLAGS+= -mod=vendor