dev-lang/go: 1.25.4 revbump to fix cgo c constant references

Closes: https://bugs.gentoo.org/966192
Signed-off-by: William Hubbs <williamh@gentoo.org>

2 files changed, 225 insertions, 0 deletions

diff --git a/dev-lang/go/files/go-1.25-strip-top-level-const.patch b/dev-lang/go/files/go-1.25-strip-top-level-const.patch
new file mode 100644
index 000000000000..1531263e3ed7
--- /dev/null
+++ b/dev-lang/go/files/go-1.25-strip-top-level-const.patch
@@ -0,0 +1,94 @@
+From 7a6e3f07acfd822aa1d62f1c715125e30d67d089 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 03 Nov 2025 15:54:39 -0800
+Subject: [PATCH] cmd/cgo: strip top-level const qualifier from argument frame struct
+
+Otherwise we can't assign to it.
+
+Fixes #75751
+
+Change-Id: Iba680db672297bca1a1d1a33912b80863da66a08
+---
+
+diff --git a/src/cmd/cgo/internal/test/test.go b/src/cmd/cgo/internal/test/test.go
+index 9626407..e83e367 100644
+--- a/src/cmd/cgo/internal/test/test.go
++++ b/src/cmd/cgo/internal/test/test.go
+@@ -953,6 +953,12 @@
+ } issue69086struct;
+ static int issue690861(issue69086struct* p) { p->b = 1234; return p->c; }
+ static int issue690862(unsigned long ul1, unsigned long ul2, unsigned int u, issue69086struct s) { return (int)(s.b); }
++
++char issue75751v = 1;
++char * const issue75751p = &issue75751v;
++#define issue75751m issue75751p
++char * const volatile issue75751p2 = &issue75751v;
++#define issue75751m2 issue75751p2
+ */
+ import "C"
+ 
+@@ -2396,3 +2402,8 @@
+ 		t.Errorf("call: got %d, want 1234", got)
+ 	}
+ }
++
++// Issue 75751: no runtime test, just make sure it compiles.
++func test75751() int {
++	return int(*C.issue75751m) + int(*C.issue75751m2)
++}
+diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
+index 394e766..05d9dcf 100644
+--- a/src/cmd/cgo/out.go
++++ b/src/cmd/cgo/out.go
+@@ -457,6 +457,33 @@
+ // Also assumes that gc convention is to word-align the
+ // input and output parameters.
+ func (p *Package) structType(n *Name) (string, int64) {
++	// It's possible for us to see a type with a top-level const here,
++	// which will give us an unusable struct type. See #75751.
++	// The top-level const will always appear as a final qualifier,
++	// constructed by typeConv.loadType in the dwarf.QualType case.
++	// The top-level const is meaningless here and can simply be removed.
++	stripConst := func(s string) string {
++		i := strings.LastIndex(s, "const")
++		if i == -1 {
++			return s
++		}
++
++		// A top-level const can only be followed by other qualifiers.
++		if r, ok := strings.CutSuffix(s, "const"); ok {
++			return r
++		}
++
++		for _, f := range strings.Fields(s[i:]) {
++			switch f {
++			case "const", "restrict", "volatile":
++			default:
++				return s
++			}
++		}
++
++		return strings.TrimSpace(s[:i]) + strings.TrimSpace(s[i+len("const"):])
++	}
++
+ 	var buf strings.Builder
+ 	fmt.Fprint(&buf, "struct {\n")
+ 	off := int64(0)
+@@ -468,7 +495,7 @@
+ 		}
+ 		c := t.Typedef
+ 		if c == "" {
+-			c = t.C.String()
++			c = stripConst(t.C.String())
+ 		}
+ 		fmt.Fprintf(&buf, "\t\t%s p%d;\n", c, i)
+ 		off += t.Size
+@@ -484,7 +511,7 @@
+ 			fmt.Fprintf(&buf, "\t\tchar __pad%d[%d];\n", off, pad)
+ 			off += pad
+ 		}
+-		fmt.Fprintf(&buf, "\t\t%s r;\n", t.C)
++		fmt.Fprintf(&buf, "\t\t%s r;\n", stripConst(t.C.String()))
+ 		off += t.Size
+ 	}
+ 	if off%p.PtrSize != 0 {
diff --git a/dev-lang/go/go-1.25.4-r1.ebuild b/dev-lang/go/go-1.25.4-r1.ebuild
new file mode 100644
index 000000000000..27e0f8a95020
--- /dev/null
+++ b/dev-lang/go/go-1.25.4-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+# See "Bootstrap" in release notes
+GO_BOOTSTRAP_MIN=1.22.12
+MY_PV=${PV/_/}
+
+inherit go-env toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://go.dev/dl/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	;;
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://go.dev"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+BDEPEND="|| (
+		>=dev-lang/go-${GO_BOOTSTRAP_MIN}
+		>=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )"
+
+# the *.syso files have writable/executable stacks
+QA_EXECSTACK='*.syso'
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# This package triggers "unrecognized elf file(s)" notices on riscv.
+# https://bugs.gentoo.org/794046
+QA_PREBUILT="*"
+QA_PRESTRIPPED="*.syso"
+
+DOCS=(
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
+)
+
+go_tuple() {
+	echo "$(go-env_goos $@)_$(go-env_goarch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+PATCHES=(
+	"${FILESDIR}"/go-1.24-skip-gdb-tests.patch
+	"${FILESDIR}"/go-1.24-dont-force-gold-arm.patch
+	"${FILESDIR}"/go-1.25-no-dwarf5.patch
+	"${FILESDIR}"/go-1.25-strip-top-level-const.patch
+	"${FILESDIR}"/go-never-download-newer-toolchains.patch
+)
+
+src_compile() {
+	if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go-env_goarch ${CBUILD})
+	export GOHOSTOS=$(go-env_goos ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go-env_goarch)
+	export GOOS=$(go-env_goos)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go-env_goarm)
+	use x86 && export GO386=$(go-env_go386)
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild -k || die "tests failed"
+}
+
+src_install() {
+	dodir /usr/lib/go
+	# The use of cp is deliberate in order to retain permissions
+	cp -R . "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	# The other files we remove are installed by einstalldocs
+	rm -r $(find "${ED}"/usr/lib/go -iname testdata -type d -print) || die
+	rm "${ED}"/usr/lib/go/{CONTRIBUTING.md,PATENTS,README.md} || die
+	rm "${ED}"/usr/lib/go/{SECURITY.md,codereview.cfg,LICENSE} || die
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+}