gentoo auto-resync : 08:05:2024 - 00:00:57

3 files changed, 377 insertions, 1 deletions

diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 329a9238004a..47d519c8c59f 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -1,7 +1,11 @@
 AUX gcc-12.2.0-drop-cflags-sed.patch 1077 BLAKE2B 4e0ff834cbfd4597c67d9adf2e287f2e40b746a6a6b31c52b95ab4b20292aad1931a1f64ffabd2bef611af85b643718e5a4a280d1e3b54e0a9f73b086d0dc39e SHA512 35647183fdf82bc179d94504d22a5e00a955121e888b5419a0033b7723a7e385c196096c64bf9ed59ad2c72188cb4792049ce423b226bfeb40ed379c355b91b8
 AUX gcc-13.2.0-libcxx-17.patch 1158 BLAKE2B c6ea274e12b06ee9c806b6790cdaffc3bafeb555ba4487f1903a129af4329e1c80e23cfe69924acb7fbf2c0ab3f3acbad49f17436da2c8a0e364388ce8589ffa SHA512 d87824ed42aa797265cb41b93a86d01bb373730156e5f98109a6c9f7519da7c39f9c97b14bd47e0f90febd505bb029e3356a04b8911fbd6b590be06cea1aee10
 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
+DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
 DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
+DIST gcc-14.1.0.tar.xz 92265736 BLAKE2B 7efd6574b8bca081de6e31480ec0565c6d7fb773383e8e1fdcc17e35bba2bf44b3f4f995cdbcccd001689926e96a6563ef3d099902fe3b37ab09dcf553ab0596 SHA512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea
 DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086eab74e228d7275725ffb4f07e283fd75169dbe0900a9c29494fba9ddb2ea03bdd6ae26f06048311e9c93ae3e317c4c060 SHA512 bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d
+DIST mingw-w64-v11.0.1.tar.bz2 10057401 BLAKE2B 3222eed35522bf95a571b11dc52ea23153068b32497676dbb2837306ba52a78e6d1c9c44a4d64d314e64583b54f6fe86dcff3e467e101acf71cebb7d2a963963 SHA512 568702100bbbb11f7f9c9596dd70df3fb2577492459cf55da38691af1504b91127cb5f3eff268850dcbaa461fdc72e4e2379f7a576fd4a0e537ee1fe42531c01
 EBUILD mingw64-toolchain-11.0.0_p2.ebuild 10556 BLAKE2B 2475e8e31bda6fab10d53dfc3d2ec4e2b9cc6defe44050bc67890278cdbf4a8b4ec564915358d96e5e3a094c632a50a552bbcbc8145e26fa3bb5c1372847d3af SHA512 3238e525f3031a0df62a050c6c1721b27e0805e8c6ee349e07d231bf5c69780bd7f92680f4520f6ed2633fc34ad7848f1f022e1554aebea21bc9396fa503238c
-MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
+EBUILD mingw64-toolchain-11.0.1.ebuild 11194 BLAKE2B 649cb88f17794db74570873390df31264b7097f5914d9f8947a7281421cf8a59fb35a198b608c7a8ce889cc5a3a6377823de89b680f8b06d85847242054e805c SHA512 02120145d2605440c799ab80b711fa6021b38ccc5d381691cf891ea8dd08697a8fc6f5445baf0ac6d38b3af3a7706a493a5459380a9e72db6058c0ec3840e8a8
+MISC metadata.xml 639 BLAKE2B 40e8fb879c8f26b7ba49bf453f242fbfd2a7950a0ec07f41945172a97ae77bdcf3ddfda741c6cf9f436efc42e9f5e72ccef67b408f62ea41335383eab76761f9 SHA512 280133ff26c17f4195635d3ab124a60d73bec1a2d841c91d89821dab18058381d30c4661f621c586ba4af31955cd902f1ef042301e04ff056ce20d0c45b7c4eb
diff --git a/dev-util/mingw64-toolchain/metadata.xml b/dev-util/mingw64-toolchain/metadata.xml
index 7a95ab69a652..ec66707e7ad0 100644
--- a/dev-util/mingw64-toolchain/metadata.xml
+++ b/dev-util/mingw64-toolchain/metadata.xml
@@ -5,6 +5,13 @@
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<use>
+		<flag name="bin-symlinks">
+			Symlink executables to usr/bin to be in default
+			PATH (conflicts with crossdev mingw, and crossdev
+			is preferable for a fully featured toolchain)
+		</flag>
+	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
 		<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.1.ebuild
new file mode 100644
index 000000000000..4003b26827a8
--- /dev/null
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit edo flag-o-matic multilib-build toolchain-funcs
+
+# Pick versions known to work for wine+dxvk, and avoid too frequent updates
+# due to slow rebuilds. Do _p1++ rather than revbump on changes (not using
+# Gentoo patchsets for simplicity, their changes are mostly unneeded here).
+BINUTILS_PV=2.42
+GCC_PV=14.1.0
+MINGW_PV=$(ver_cut 1-3)
+
+DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev"
+HOMEPAGE="
+	https://www.mingw-w64.org/
+	https://gcc.gnu.org/
+	https://sourceware.org/binutils/
+"
+SRC_URI="
+	https://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2
+	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
+"
+if [[ ${GCC_PV} == *-* ]]; then
+	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
+else
+	SRC_URI+="
+		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+	"
+fi
+S="${WORKDIR}"
+
+# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime
+LICENSE="
+	GPL-3+
+	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
+	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
+"
+SLOT="0"
+# unkeyworded for testing
+#KEYWORDS="-* ~amd64 ~x86"
+IUSE="+abi_x86_32 bin-symlinks custom-cflags +strip"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/mpc:=
+	dev-libs/mpfr:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	bin-symlinks? (
+		abi_x86_64? (
+			!cross-x86_64-w64-mingw32/binutils
+			!cross-x86_64-w64-mingw32/gcc
+		)
+		abi_x86_32? (
+			!cross-i686-w64-mingw32/binutils
+			!cross-i686-w64-mingw32/gcc
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	strerror_r # libstdc++ test using -Wimplicit+error
+)
+
+PATCHES=(
+	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	tc-is-cross-compiler &&
+		die "cross-compilation of the toolchain itself is unsupported"
+}
+
+src_prepare() {
+	# rename directories to simplify both patching and the ebuild
+	mv binutils{-${BINUTILS_PV},} || die
+	mv gcc{-${GCC_PV},} || die
+	mv mingw-w64-v${MINGW_PV} mingw64 || die
+
+	default
+}
+
+src_compile() {
+	# not great but do everything in src_compile given bootstrapping
+	# process needs to be done in steps of configure+compile+install
+	# (done modular to have most package-specific things in one place)
+
+	CTARGET=$(usex x86 i686 x86_64)-w64-mingw32
+
+	MWT_D=${T}/root # moved to ${D} in src_install
+	local mwtdir=/usr/lib/${PN}
+	local prefix=${EPREFIX}${mwtdir}
+	local sysroot=${MWT_D}${prefix}
+	local -x PATH=${sysroot}/bin:${PATH}
+
+	filter-lto # requires setting up, and may be messy with mingw static libs
+	use custom-cflags || strip-flags # fancy flags are not realistic here
+
+	local multilib=false
+	use abi_x86_32 && use abi_x86_64 && multilib=true
+
+	# global configure flags
+	local conf=(
+		--build=${CBUILD:-${CHOST}}
+		--target=${CTARGET}
+		--{doc,info,man}dir=/.skip # let the real binutils+gcc handle docs
+		MAKEINFO=: #922230
+	)
+
+	# binutils
+	local conf_binutils=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-cet
+		--disable-default-execstack
+		--disable-nls
+		--disable-shared
+		--with-system-zlib
+		--without-debuginfod
+		--without-msgpack
+		--without-zstd
+	)
+	mwt-binutils() {
+		# symlink gcc's lto plugin for AR (bug #854516)
+		ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%[.-]*}/liblto_plugin.so \
+			"${sysroot}"/lib/bfd-plugins || die
+	}
+
+	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
+	local conf_gcc=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-bootstrap
+		--disable-cet
+		--disable-gcov #843989
+		--disable-gomp
+		--disable-libquadmath
+		--disable-libsanitizer
+		--disable-libssp
+		--disable-libvtv
+		--disable-shared
+		--disable-werror
+		--with-gcc-major-version-only
+		--with-system-zlib
+		--without-isl
+		--without-zstd
+	)
+	${multilib} || conf_gcc+=( --disable-multilib )
+	# libstdc++ may misdetect sys/sdt.h on systemtap-enabled system and fail
+	# (not passed in conf_gcc above given it is lost in sub-configure calls)
+	local -x glibcxx_cv_sys_sdt_h=no
+
+	local conf_gcc_stage1=(
+		--enable-languages=c
+		--disable-libatomic
+		--with-sysroot="${sysroot}"
+	)
+	local -n conf_gcc_stage2=conf_gcc_stage1
+
+	local conf_gcc_stage3=(
+		--enable-languages=c,c++
+		--enable-threads=posix # needs stage3, and is required for dxvk/vkd3d
+		--with-sysroot="${prefix}"
+		--with-build-sysroot="${sysroot}"
+	)
+
+	# mingw64-runtime (split in several parts, 3 needed for gcc stages)
+	local conf_mingw64=(
+		--prefix="${prefix}"/${CTARGET}
+		--host=${CTARGET}
+		--with-sysroot=no
+		--without-{crt,headers}
+
+		# mingw .dll aren't used by wine and packages wouldn't find them
+		# at runtime, use crossdev if need dll and proper search paths
+		--disable-shared
+	)
+
+	local conf_mingw64_headers=(
+		--enable-idl
+		--with-headers
+	)
+	mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601
+
+	local conf_mingw64_runtime=( --with-crt )
+	${multilib} ||
+		conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) )
+
+	local conf_mingw64_libraries=( --with-libraries )
+	local conf_mingw64_libraries32=(
+		--libdir="${prefix}"/${CTARGET}/lib32
+		--with-libraries
+		CC="${CTARGET}-gcc -m32"
+		RCFLAGS="--target=pe-i386 ${RCFLAGS}"
+	)
+
+	# mingw64-runtime's idl compiler (useful not to depend on wine for widl)
+	local conf_widl=( --prefix="${prefix}" )
+
+	# mwt-build [-x] <path/package-name> [stage-name]
+	# -> ./configure && make && make install && mwt-package() && mwt-package_stage()
+	# passes conf, conf_package, and conf_package_stage arrays to configure, and
+	# users can add options through environment with e.g.
+	#	MWT_BINUTILS_CONF="--some-option"
+	#	MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option"
+	#	MWT_WIDL_CONF="--some-other-option"
+	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
+	mwt-build() {
+		if [[ ${1} == -x ]]; then
+			(
+				# cross-compiling, cleanup and let ./configure handle it
+				unset AR AS CC CPP CXX DLLTOOL LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
+				CHOST=${CTARGET}
+				filter-flags '-fuse-ld=*'
+				filter-flags '-mfunction-return=thunk*' #878849
+
+				# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+				# strip-unsupported-flags miss these during compile-only tests
+				# (primarily done for 23.0 profiles' -z, not full coverage)
+				filter-flags '-Wl,-z,*'
+
+				# -mavx with mingw-gcc has a history of obscure issues and
+				# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
+				# crashes with -march=skylake >=wine-8.10, similar issues with
+				# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+				append-flags -mno-avx
+
+				strip-unsupported-flags
+				mwt-build "${@:2}"
+			)
+			return
+		fi
+
+		local id=${1##*/}
+		local build_dir=${WORKDIR}/${1}${2+_${2}}-build
+
+		# econf is not allowed in src_compile and its defaults are
+		# mostly unused here, so use configure directly
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
+
+		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
+
+		mkdir -p "${build_dir}" || die
+		pushd "${build_dir}" >/dev/null || die
+
+		edo "${conf[@]}"
+		emake MAKEINFO=: V=1
+		# -j1 to match bug #906155, other packages may be fragile too
+		emake -j1 MAKEINFO=: V=1 DESTDIR="${MWT_D}" install
+
+		declare -f mwt-${id} >/dev/null && edo mwt-${id}
+		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
+
+		popd >/dev/null || die
+	}
+
+	# workaround race condition with out-of-source crt build (bug #879537)
+	mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die
+
+	# build with same ordering that crossdev would do + stage3 for pthreads
+	mwt-build binutils
+	mwt-build mingw64 headers
+	mwt-build gcc stage1
+	mwt-build -x mingw64 runtime
+	mwt-build gcc stage2
+	${multilib} && mwt-build -x mingw64 libraries32
+	mwt-build -x mingw64 libraries
+	mwt-build gcc stage3
+	mwt-build mingw64/mingw-w64-tools/widl
+	# note: /could/ system-bootstrap if already installed, but gcc and
+	# libraries will use the system's older mingw64 headers/static-libs
+	# and make this potentially fragile without more workarounds/stages
+
+	if ${multilib}; then
+		# Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86,
+		# but packages expect crossdev's i686-w64-mingw32-gcc which is the same
+		# just without 64bit support and would rather not build the toolchain
+		# twice. Dirty but wrap to allow simple interoperability with crossdev.
+		mwt-i686_wrapper() {
+			printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \
+				> ${bin32} || die
+			chmod +x ${bin32} || die
+		}
+		pushd "${sysroot}"/bin >/dev/null || die
+		local bin bin32
+		for bin in ${CTARGET}-*; do
+			bin32=${bin/x86_64-w64/i686-w64}
+			case ${bin#${CTARGET}-} in
+				as) mwt-i686_wrapper --32;;
+				cpp|gcc|gcc-${GCC_PV%%[.-]*}|g++|widl) mwt-i686_wrapper -m32;;
+				ld|ld.bfd) mwt-i686_wrapper -m i386pe;;
+				windres) mwt-i686_wrapper --target=pe-i386;;
+				*) ln -s ${bin} ${bin32} || die;;
+			esac
+		done
+		popd >/dev/null || die
+	fi
+
+	if use bin-symlinks; then
+		mkdir -p -- "${MWT_D}${EPREFIX}"/usr/bin/ || die
+		local bin
+		for bin in "${sysroot}"/bin/*; do
+			ln -rs -- "${bin}" "${MWT_D}${EPREFIX}"/usr/bin/ || die
+		done
+	fi
+
+	# portage doesn't know the right strip executable to use for CTARGET
+	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
+	dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
+
+	# ... and instead do it here given this saves ~60MB
+	if use strip; then
+		einfo "Stripping ${CTARGET} static libraries ..."
+		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
+			-exec ${CTARGET}-strip --strip-unneeded {} + || die
+	fi
+}
+
+src_install() {
+	mv -- "${MWT_D}${EPREFIX}"/* "${ED}" || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] &&
+		eselect compiler-shadow update all
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that this package is primarily intended for Wine and related"
+		elog "packages to depend on without needing a manual crossdev setup."
+		elog
+		elog "Settings are oriented only for what these need and simplicity."
+		elog "Use sys-devel/crossdev if need full toolchain/customization:"
+		elog "    https://wiki.gentoo.org/wiki/Mingw"
+		elog "    https://wiki.gentoo.org/wiki/Crossdev"
+	fi
+
+	local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc
+	if has_version ${cross_gcc}; then
+		# encourage cleanup given users may not realize if switch by default
+		ewarn "${cross_gcc} is installed, note that ${PN}"
+		ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}"
+		ewarn "packages and optionally only one needs to be kept."
+	fi
+}
+
+pkg_postrm() {
+	use bin-symlinks && has_version dev-util/shadowman && [[ ! ${ROOT} ]] &&
+		eselect compiler-shadow clean all
+}