gentoo auto-resync : 22:05:2024 - 00:06:25HEADmaster

3 files changed, 11 insertions, 155 deletions

diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index c3aaffd0f250..bac21483d2ee 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,5 +1,3 @@
-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-runtime-11.0.0.ebuild 4661 BLAKE2B e052a3936ed05dcb11f8d7a94bb379a6de7c5aaaf4ff830f08c326a85220ead19aa9bfcef0d0133aa3f90361bb85abe5ab61897940ae7a705951b4df714bf82f SHA512 d32f1ede5f9b2507823b2bce4f048cefc94950e25ec7c27707fb7f86daeb4d85e62070b9afd53d4aff284210ce479ab1c960637f36dca14ba058b7d7e0c4cb70
-EBUILD mingw64-runtime-11.0.1.ebuild 4662 BLAKE2B 35460f47ab5dd4258518e51e2f0d75b628b23dddb30d50468b20acd8cff0a78265173b6d1163471a30ddb9b48dab3034f4e46c07ee6fbc08354b3daf74c2f3a3 SHA512 f6a2df205d562c946fdb2c86828303e7365f0d31edf26926481cad0b5c1d47599a5a2fbafbd3ea91e341356d02a69eb8f1cf55ec52789ac1d97bcd8521a00f75
+EBUILD mingw64-runtime-11.0.1.ebuild 4778 BLAKE2B a6d839c6aefec1e96afa94beb0455b3312bc89ddb39dc6e6ff28744ce9c79fb9d388905978c2fbd521356859115ee520801cebf97f1d13628c49c7f427a7f444 SHA512 84e990ff4932127c27fcc680565728d2798e61d129c6990c6ec87dee117f2be3326ba5d741aa097d58cc03535368fd5ef9898ca77f83c47453d05493e9bdce8a
 MISC metadata.xml 904 BLAKE2B b7b42242ff7a39ba87ec4889295bb1229122bd20f34c163499423d989120569d5b6c69ed9490f328aa1af8a9dd3ff2ec0f07b85910e7d2eb401f40dbd670d366 SHA512 80bb5c58cf80d7233599e772a1e615ec4b4f16bd9387539a684d11e0b7196e7a3d21f1b56d18271b9a4b0544253e3fec4130ff70702ba4cf5684941ff8d49a51
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-11.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-11.0.0.ebuild
deleted file mode 100644
index 768dd36be67a..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-11.0.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit crossdev flag-o-matic toolchain-funcs
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="https://www.mingw-w64.org/"
-SRC_URI="https://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# default-ucrt: enabling requires to be done during the bootstrap process
-# or else will cause e.g. undefined reference to __intrinsic_setjmpex
-# libraries: needs working stage2 compiler (bug #665512)
-IUSE="default-ucrt headers-only idl libraries tools"
-RESTRICT="strip" # portage would use the wrong strip executable
-
-pkg_setup() {
-	target_is_not_host && MW_CROSS=true || MW_CROSS=false
-	[[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] &&
-		die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw"
-}
-
-mingw-foreach_tool() {
-	use !tools || use headers-only && return
-
-	local tool=widl
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		einfo "Skipping widl due to unsupported platform" #853250
-		tool=
-	fi
-
-	for tool in gendef genidl ${tool}; do
-		# not using top-level --with-tools given it skips widl
-		pushd mingw-w64-tools/${tool} >/dev/null || die
-		"${@}"
-		popd >/dev/null || die
-	done
-}
-
-src_configure() {
-	# native tools, see #644556
-	local toolsconf=()
-	# normally only widl is prefixed, but avoids clash with other targets
-	${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- )
-
-	mingw-foreach_tool econf "${toolsconf[@]}"
-
-	MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
-
-	# likely cross-compiling from here, update toolchain variables
-	if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then
-		unset AR AS CC CPP CXX DLLTOOL LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
-		filter-flags '-fuse-ld=*'
-		filter-flags '-mfunction-return=thunk*' #878849
-	fi
-	local CHOST=${CTARGET}
-
-	# 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
-	tc-is-gcc && append-flags -mno-avx
-
-	strip-unsupported-flags
-
-	# Normally mingw64 does not use dynamic linker, but at configure time it
-	# uses LDFLAGS. When -Wl,--hash-style=gnu is passed __CTORS_LIST__ /
-	# __DTORS_LIST__ is misdetected for target and binaries crash at shutdown.
-	# Note: typically also stripped by strip-unsupported-flags, but not during
-	# USE=headers-only and potentially other configurations (kept as safety).
-	filter-ldflags '-Wl,--hash-style=*'
-
-	local prefix=${EPREFIX}/usr
-	${MW_CROSS} && prefix+=/${CTARGET}/usr
-
-	local conf=(
-		--prefix="${prefix}"
-		--libdir="${prefix}"/lib
-		$(use_with !headers-only crt)
-		$(usev default-ucrt --with-default-msvcrt=ucrt)
-
-		# By default configure tries to set --sysroot=${prefix}. We disable
-		# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-		# That way we can cross-build mingw64-runtime with cross-emerge.
-		--with-sysroot=no
-	)
-
-	if use !headers-only; then
-		conf+=(
-			$(use_enable idl)
-			$(use_with libraries)
-		)
-
-		# prefer tuple to determine if should do 32 or 64bits, but fall
-		# back to cpp test if missing (bug #584858, see also #840662)
-		local b32=true
-		case ${CHOST} in
-			x86_64-*) b32=false;;
-			i*86-*) ;;
-			*) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;;
-		esac
-		${b32} &&
-			conf+=( --enable-lib32 --disable-lib64 ) ||
-			conf+=( --disable-lib32 --enable-lib64 )
-
-		# prepare temporary headers install to build against same-version
-		mkdir ../headers || die
-		pushd ../headers >/dev/null || die
-		ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt
-		popd >/dev/null || die
-
-		append-cppflags "-I${T}/root/include"
-	fi
-
-	econf "${conf[@]}"
-}
-
-src_compile() {
-	use headers-only || emake -C ../headers install
-	emake
-	mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}"
-}
-
-src_install() {
-	default
-
-	mingw-foreach_tool emake DESTDIR="${D}" install
-
-	if ${MW_CROSS}; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	rm -r "${ED}"/usr/share || die
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild
index 15f76259b1af..f2723d866456 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-11.0.1.ebuild
@@ -65,11 +65,16 @@ src_configure() {
 	# (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
-	tc-is-gcc && append-flags -mno-avx
+	if tc-is-gcc; then
+		# -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
+
+		# gcc14 -fno-omit-frame-pointer ICE workaround (bug #932319)
+		append-flags -fomit-frame-pointer
+	fi
 
 	strip-unsupported-flags