From nobody Thu May 23 14:57:23 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VlWVX0hZjz5LsRy; Thu, 23 May 2024 14:57:24 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VlWVW71qFz4QsJ; Thu, 23 May 2024 14:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716476244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gak3Hbg4vC3r/FKMMcVX8cjCItZmMX9wpVsCRa+sB2k=; b=pv/Ec85V+vs2cSjuGr6WnSVgEWcmnWxw1CU5OkZn5tHVSkr+kXX77WjjIKxXBtytLxYg/o ZUvMO/1F/b1Cp8zBFVDm04dxMK8Q/iLcnOjJqL+/lDpw3QpL1/85+JtT4gUgpMEAbjzEtV zo8oPoRKHMMHRmybmvz9kSKG5nKBpKR3Q0SymFo+2+srYGPxaDJyPY7GvUulOQgOu3EkAX suSloGWuGV3faXA1jIU3RgZp2FyKVDPlZhoNHvf9CID4fGIignuj8A7BXmuOTPvAL9ZtR4 Hj3k3WtPI1aoTJBIPS/ErPpraR+xaAZH9bKCghB2pnKOzWhPmWysdQsf5G2Svw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716476244; a=rsa-sha256; cv=none; b=cC3Lbn3md7AdQ9d3eF4D7FwcYe3QfXHJILuU//7F8FQtZhXvK5J7DmcyJmfVcJ81WY7JlM kISmr1/9Jxw9G8O6xQNSQr+mMswCNqVzOFk4xjF2nZkLGpEtSlks9sVAGKPxcVCebzHg6t WxaAPq1+5Sl2nKxXO6jHyIM/lWIhvQv48xA55EeSNYY5TmP6mR9SQ70bpYuSvuyaupySEW tnnOwx6KJiALO98rI/+9sosYdAznVZ+7JvbrOKIRd/WecWt7iw+6aJ9PZ4gteHjOLBoDy2 GgYi4BtZY+9v3yxcrb7Sl5BourdRtsWirJKGHdG75slkgJI2Nuciwcfc/cjYow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716476244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gak3Hbg4vC3r/FKMMcVX8cjCItZmMX9wpVsCRa+sB2k=; b=tCbo5EAYfrZEfTWeJoUqOVSaWJ4EQ7xdXSMRhafyX4rCEUqNF5Fdnw/1dwoCzV2436zQg2 n6mg5G/BzhlCW76ALCjzEbe+3DGy60J5XDoqPM4BVGlReIIPLWNUICmZFRD6UVfV9etL/d ccLLAIcwKPl042zzHgkeReKR2R2bQG6N9PDsdBkPXD+E/RRshlq/bOd1DVn1ayvRjJqEtx MZBN/w4pXHI6DU06REk65SLvCd7vVotz0h8+R1cvRXgDzNUc//WglsF497s6stgT7CgY3r HqacMlJoZyVSS76TL7nMk3F1rqkZrLzrce+6uA8whm2sWeD+Cbw558H4LFYvYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VlWVW6bByztNV; Thu, 23 May 2024 14:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44NEvNrF092980; Thu, 23 May 2024 14:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NEvNDC092977; Thu, 23 May 2024 14:57:23 GMT (envelope-from git) Date: Thu, 23 May 2024 14:57:23 GMT Message-Id: <202405231457.44NEvNDC092977@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 1ec501743bd9 - main - lang/go122: fix build on armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ec501743bd9a626af211b4cab06751227a4d703 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ec501743bd9a626af211b4cab06751227a4d703 commit 1ec501743bd9a626af211b4cab06751227a4d703 Author: Robert Clausecker AuthorDate: 2024-05-13 18:45:02 +0000 Commit: Robert Clausecker CommitDate: 2024-05-23 14:55:55 +0000 lang/go122: fix build on armv7 This backports a commit needed to get proper barriers during bootstrap when building Go with more than one job on armv7. Note that this only changes the behaviour when building the bootstrap toolchain. Binaries generated using the toolchain are not affected and hence Go ports need not be bumped. PR: 278953 Approved by: portmgr (build fix blanket) Obtained from: https://go-review.googlesource.com/c/go/+/562995 See also: https://github.com/golang/go/issues/65601 MFH: 2024Q2 --- lang/go122/Makefile | 3 ++- lang/go122/files/patch-src_cmd_dist_build.go | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lang/go122/Makefile b/lang/go122/Makefile index 962a50d32f6e..56d24ab1246e 100644 --- a/lang/go122/Makefile +++ b/lang/go122/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 1.22.3 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel -PORTREVISION= 0 +PORTREVISION= 1 MASTER_SITES= https://golang.org/dl/ \ https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \ LOCAL/dmgk:bootstrap @@ -9,6 +9,7 @@ DISTFILES= go${DISTVERSION}.src.tar.gz \ # Avoid conflicting patch files PATCHFILES= +PATCHDIR= ${.CURDIR}/files COMMENT= Go programming language diff --git a/lang/go122/files/patch-src_cmd_dist_build.go b/lang/go122/files/patch-src_cmd_dist_build.go new file mode 100644 index 000000000000..59fd0c6539f8 --- /dev/null +++ b/lang/go122/files/patch-src_cmd_dist_build.go @@ -0,0 +1,23 @@ +--- src/cmd/dist/build.go.orig 2024-03-29 15:27:02 UTC ++++ src/cmd/dist/build.go +@@ -891,6 +891,20 @@ func runInstall(pkg string, ch chan struct{}) { + asmArgs = append(asmArgs, "-D", "GOPPC64_power8") + } + } ++ if goarch == "arm" { ++ // Define GOARM_value from goarm, which can be either a version ++ // like "6", or a version and a FP mode, like "7,hardfloat". ++ switch { ++ case strings.Contains(goarm, "7"): ++ asmArgs = append(asmArgs, "-D", "GOARM_7") ++ fallthrough ++ case strings.Contains(goarm, "6"): ++ asmArgs = append(asmArgs, "-D", "GOARM_6") ++ fallthrough ++ default: ++ asmArgs = append(asmArgs, "-D", "GOARM_5") ++ } ++ } + goasmh := pathf("%s/go_asm.h", workdir) + + // Collect symabis from assembly code.