commit: 0ee2772789c5508e1efa8b1f9cc44e23b8c6a216 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Sep 12 15:53:32 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Sep 12 15:53:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee27727
dev-util/mingw64-runtime: drop 10.0.0-r1 Don't believe should still be a need for this, 11 been lookg uneventful. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/mingw64-runtime/Manifest | 1 - .../mingw64-runtime-10.0.0-msvcr-extra-race.patch | 22 --- .../mingw64-runtime-7.0.0-fortify-only-ssp.patch | 16 --- .../mingw64-runtime-10.0.0-r1.ebuild | 153 --------------------- 4 files changed, 192 deletions(-) diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest index 1bc5f52fb0bc..df4a29fd9568 100644 --- a/dev-util/mingw64-runtime/Manifest +++ b/dev-util/mingw64-runtime/Manifest @@ -1,2 +1 @@ -DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516 DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086eab74e228d7275725ffb4f07e283fd75169dbe0900a9c29494fba9ddb2ea03bdd6ae26f06048311e9c93ae3e317c4c060 SHA512 bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch deleted file mode 100644 index 3e57c755731a..000000000000 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/879537 -https://sourceforge.net/p/mingw-w64/mingw-w64/ci/e1b0c1420bbd52ef505c71737c57393ac1397b0a -(Makefile.in regenerated in 0eeb66e041327b9ca3f6bc1dd1d0a0bd2f46254d) ---- a/mingw-w64-crt/Makefile.in -+++ b/mingw-w64-crt/Makefile.in -@@ -77916,11 +77916,11 @@ - @LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<) --@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt10.a: lib32/msvcrt10.mri lib32/libmsvcrt10_def.a lib32/libmsvcrt_common.a -+@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt10.a: lib32/msvcrt10.mri lib32/libmsvcrt10_def.a lib32/libmsvcrt_common.a lib32/libmsvcrt10_extra.a - @LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<) --@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt20.a: lib32/msvcrt20.mri lib32/libmsvcrt20_def.a lib32/libmsvcrt_common.a -+@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt20.a: lib32/msvcrt20.mri lib32/libmsvcrt20_def.a lib32/libmsvcrt_common.a lib32/libmsvcrt20_extra.a - @LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<) --@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt40.a: lib32/msvcrt40.mri lib32/libmsvcrt40_def.a lib32/libmsvcrt_common.a -+@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcrt40.a: lib32/msvcrt40.mri lib32/libmsvcrt40_def.a lib32/libmsvcrt_common.a lib32/libmsvcrt40_extra.a - @LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<) --@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr70.a: lib32/msvcr70.mri lib32/libmsvcr70_def.a lib32/libmsvcrt_common.a -+@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr70.a: lib32/msvcr70.mri lib32/libmsvcr70_def.a lib32/libmsvcrt_common.a lib32/libmsvcr70_extra.a - @LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<) --@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr71.a: lib32/msvcr71.mri lib32/libmsvcr71_def.a lib32/libmsvcrt_common.a -+@LIB32_TRUE@@W32API_FALSE@lib32/libmsvcr71.a: lib32/msvcr71.mri lib32/libmsvcr71_def.a lib32/libmsvcrt_common.a lib32/libmsvcr71_extra.a - @LIB32_TRUE@@W32API_FALSE@ cd $(dir $@) && $(AR) -M < $(abspath $<) diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch deleted file mode 100644 index 72ddd775a2ea..000000000000 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/mingw-w64-headers/crt/_mingw_mac.h -+++ b/mingw-w64-headers/crt/_mingw_mac.h -@@ -301,7 +301,12 @@ - # define __mingw_attribute_artificial - #endif - --#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __MINGW_GNUC_PREREQ(4, 1) -+/* __SSP__ is a workaround to avoid reference to libssp when user did not request it: -+ * https://sourceforge.net/p/mingw-w64/bugs/818/ -+ * Otherwise it breaks both USE=ssp gcc bootstrap and projects that happen to use -+ * strcpy/memcpy. -+ */ -+#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __MINGW_GNUC_PREREQ(4, 1) && __SSP__ > 0 - # if _FORTIFY_SOURCE > 1 - # define __MINGW_FORTIFY_LEVEL 2 - # else diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild deleted file mode 100644 index dbbdbd2de31c..000000000000 --- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Free Win64 runtime and import library definitions" -HOMEPAGE="https://www.mingw-w64.org/"; -SRC_URI="mirror://sourceforge/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" -# USE=libraries needs working stage2 compiler: bug #665512 -IUSE="default-ucrt headers-only idl libraries tools" -RESTRICT="strip" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch - "${FILESDIR}"/${P}-msvcr-extra-race.patch -) - -pkg_setup() { - : ${CBUILD:=${CHOST}} - : ${CTARGET:=${CHOST}} - [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]] && - CTARGET=${CATEGORY#cross-} - - [[ ${CHOST} != ${CTARGET} ]] && 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 LD NM OBJCOPY OBJDUMP RANLIB RC STRIP - filter-flags '-fstack-clash-protection' #758914 - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - fi - local CHOST=${CTARGET} - - # -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 default -Wl,--hash-style=gnu is passed - # __CTORS_LIST__ / __DTORS_LIST__ is mis-detected - # for target ld and binaries crash at shutdown. - 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 -}
