From nobody Thu May 23 15:01:48 2024 X-Original-To: dev-commits-ports-branches@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 4VlWbc3GZsz5Lt6Z; Thu, 23 May 2024 15:01:48 +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 4VlWbc2mhwz4SQY; Thu, 23 May 2024 15:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716476508; 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=GnX3QaaJ7e9vnXoAr1VXQRonn9f+/f93ZzvPDDy991U=; b=qfToIS4jTTOeqBSppg9UQeDp8hX4+wvqU2ewKGy13zYh4IgGGSPX6LX8eGXMTEsJM7aXN5 1J4iyuLROe3F7dR3dKsIKE6nGA8FxLwWNcVFQ4g2yjbXKNkrhAAp8BSSEbM35kNE12Ot2o XzyAdVO8RTyruNgUKWZuS4IPNhyYSKxHqZCkMBAlWPYCtGs1mKi0tMvc7WB7+Oqew9tUyz MPjXTyQo6tOdlTiJTmxLUpAPpDxFBOhgWwjOgVsZXQukH1GZSvlBIL74AWJjPANodpZ/Yl pw533MMdub5uQzY0YMzBCnuOrg3zO32aLauPgqoCzB83rFQkFo5eN5qpATNxHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716476508; a=rsa-sha256; cv=none; b=bkJlTSkWcdcM6Dxo4vA2SrvRovuvBilwIFkGGvT/cFOsiGvCCZGeKkiE7EEqgR/H8UsT6p br3PFiuRj71EtrCWMbhw9Dxr+iCJeecOjvYSlGzjxuKirO3K8U+AOyrS8eFzzLRYwRG8oU eO2cwvudShzzsAMWOhGImdZVodC1u4D8aFtMDZht3Vus7dtewALqds0wR4fo0rQLK1PAnO qmevr70AVfAOPFnjqv0jxnIclUPzsdev0N1mwfMDk6Lfnqyb5RlEQaQJbMnIo7BSk3/riM GCkyyS4wV7toDy16lvd/5TRmHwcIJBngYqC3/JAvDAJ0egnaZl1pa4Wb70maNQ== 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=1716476508; 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=GnX3QaaJ7e9vnXoAr1VXQRonn9f+/f93ZzvPDDy991U=; b=X7dbtJzt8K8wKMj+ZvzcFo9VTmjivZwQzTgRNwCzE0Qy0qjAU6vGxOK1EmdK3tnA4FqsUL Z+xKEcmWWBebW4mhSVDsaiCeDf/RI1166O6gRaI1ziz9b3HRc1MoDKani0Lk+7QRrTE62f 558BzR5MLZp6jHm5yYeu/iFm5G8r15b+kfQfGCQwEOF6lBZgNTU4Ypl+2AW4DYndiuaa4b amGlROR4/3X0bq4adJ8YayjBDCxlUil6YA24d3yncA73XhuHuFDy1nlwkwlt9VEG1zrwZ0 FTfOW8SUo8N+VIqQgpnxohdDR1bfUoInssDpNWYBTmGsUZ9sfX6bQ9hT+ghk7A== 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 4VlWbc241Nzv9N; Thu, 23 May 2024 15:01:48 +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 44NF1mB1005353; Thu, 23 May 2024 15:01:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NF1mNb005340; Thu, 23 May 2024 15:01:48 GMT (envelope-from git) Date: Thu, 23 May 2024 15:01:48 GMT Message-Id: <202405231501.44NF1mNb005340@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5888c8d3e3cd - 2024Q2 - lang/go122: fix build on armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 5888c8d3e3cd2885b50ad9b230669f446c3c78e4 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=5888c8d3e3cd2885b50ad9b230669f446c3c78e4 commit 5888c8d3e3cd2885b50ad9b230669f446c3c78e4 Author: Robert Clausecker AuthorDate: 2024-05-13 18:45:02 +0000 Commit: Robert Clausecker CommitDate: 2024-05-23 15:01:42 +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 (cherry picked from commit 1ec501743bd9a626af211b4cab06751227a4d703) --- 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.