commit: 9970a77654637ca98a9eabd282ede3f24bb56b7d Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Sep 12 15:55:28 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Sep 12 15:55:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9970a776
dev-util/mingw64-toolchain: drop 10.0.0_p1-r2, 11.0.0 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/mingw64-toolchain/Manifest | 5 - .../files/binutils-2.40-import-lib.patch | 30 -- .../files/gcc-11.3.0-plugin-objdump.patch | 22 -- .../mingw64-runtime-10.0.0-msvcr-extra-race.patch | 22 -- .../mingw64-runtime-10.0.0-tmp-files-clash.patch | 10 - .../mingw64-toolchain-10.0.0_p1-r2.ebuild | 319 -------------------- .../mingw64-toolchain-11.0.0.ebuild | 325 --------------------- 7 files changed, 733 deletions(-) diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest index 87da411f739f..20f636111961 100644 --- a/dev-util/mingw64-toolchain/Manifest +++ b/dev-util/mingw64-toolchain/Manifest @@ -1,8 +1,3 @@ -DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 -DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 -DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 -DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33 DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 -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-toolchain/files/binutils-2.40-import-lib.patch b/dev-util/mingw64-toolchain/files/binutils-2.40-import-lib.patch deleted file mode 100644 index 844fdf93020d..000000000000 --- a/dev-util/mingw64-toolchain/files/binutils-2.40-import-lib.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fixes building app-emulation/dxvk: - - FAILED: src/d3d10/d3d10.dll - x86_64-w64-mingw32-g++ -m32 -mfpmath=sse -o src/d3d10/d3d10.dll <snip> - ld: internal error: aborting at ldlang.c:527 in compare_section - ld: please report this bug - -https://sourceware.org/PR30079 -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b7eab2a9d4f4e92692daf14b09fc95ca11b72e30 -From: Michael Matz <[email protected]> -Date: Thu, 9 Feb 2023 15:29:00 +0100 -Subject: [PATCH] Fix PR30079: abort on mingw - -the early-out in wild_sort is not enough, it might still be -that filenames are equal _and_ the wildcard list doesn't specify -a sort order either. Don't call compare_section then. - -Tested on all targets. ---- a/binutils/ld/ldlang.c -+++ b/binutils/ld/ldlang.c -@@ -649,7 +649,8 @@ wild_sort (lang_wild_statement_type *wild, - looking at the sections for this file. */ - - /* Find the correct node to append this section. */ -- if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0) -+ if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none -+ && compare_section (sec->spec.sorted, section, (*tree)->section) < 0) - tree = &((*tree)->left); - else - tree = &((*tree)->right); diff --git a/dev-util/mingw64-toolchain/files/gcc-11.3.0-plugin-objdump.patch b/dev-util/mingw64-toolchain/files/gcc-11.3.0-plugin-objdump.patch deleted file mode 100644 index 1de712de48bc..000000000000 --- a/dev-util/mingw64-toolchain/files/gcc-11.3.0-plugin-objdump.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://gcc.gnu.org/PR95648 ---- a/gcc/config/gcc-plugin.m4 -+++ b/gcc/config/gcc-plugin.m4 -@@ -47,3 +47,3 @@ - if test x$build = x$host; then -- export_sym_check="objdump${exeext} -T" -+ export_sym_check="$ac_cv_prog_OBJDUMP -T" - elif test x$host = x$target; then ---- a/gcc/gcc/configure -+++ b/gcc/gcc/configure -@@ -32069,3 +32069,3 @@ - if test x$build = x$host; then -- export_sym_check="objdump${exeext} -T" -+ export_sym_check="$ac_cv_prog_OBJDUMP -T" - elif test x$host = x$target; then ---- a/gcc/libcc1/configure -+++ b/gcc/libcc1/configure -@@ -15017,3 +15017,3 @@ - if test x$build = x$host; then -- export_sym_check="objdump${exeext} -T" -+ export_sym_check="$ac_cv_prog_OBJDUMP -T" - elif test x$host = x$target; then diff --git a/dev-util/mingw64-toolchain/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch b/dev-util/mingw64-toolchain/files/mingw64-runtime-10.0.0-msvcr-extra-race.patch deleted file mode 100644 index 263dd8b4ac9b..000000000000 --- a/dev-util/mingw64-toolchain/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/mingw64/mingw-w64-crt/Makefile.in -+++ b/mingw64/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-toolchain/files/mingw64-runtime-10.0.0-tmp-files-clash.patch b/dev-util/mingw64-toolchain/files/mingw64-runtime-10.0.0-tmp-files-clash.patch deleted file mode 100644 index 38c4abf91e77..000000000000 --- a/dev-util/mingw64-toolchain/files/mingw64-runtime-10.0.0-tmp-files-clash.patch +++ /dev/null @@ -1,10 +0,0 @@ -Fix clash when enabling lib32 and lib64 at same time, backport from: -https://sourceforge.net/p/mingw-w64/mingw-w64/ci/953bcd32ae470c4647e94de8548dda5a8f07d82d/ -(except directly to Makefile.in to avoid autoreconf over this) ---- a/mingw64/mingw-w64-crt/Makefile.in -+++ b/mingw64/mingw-w64-crt/Makefile.in -@@ -153,3 +153,3 @@ - host_triplet = @host@ --@DLLTOOL_HAS_TEMP_PREFIX_TRUE@am__append_1 = --temp-prefix $$(basename $@ .a) -+@DLLTOOL_HAS_TEMP_PREFIX_TRUE@am__append_1 = --temp-prefix $(basename $@) - @DELAY_IMPORT_LIBS_TRUE@am__append_2 = --output-delaylib [email protected] diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1-r2.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1-r2.ebuild deleted file mode 100644 index 0cd505bd6851..000000000000 --- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1-r2.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 2022-2023 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 and use vanilla for simplicity, -# ideally update only on mingw64-runtime bumps or if there's known issues -# (please report) to avoid rebuilding the entire toolchain too often. -# Do _p1++ rather than revbump if changing without bumping mingw64 itself. -BINUTILS_PV=2.39 -GCC_PV=12.2.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=" - mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2 - mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz - mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz" -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" -KEYWORDS="-* amd64 x86" -IUSE="+abi_x86_32 custom-cflags debug" - -RDEPEND=" - dev-libs/gmp:= - dev-libs/mpc:= - dev-libs/mpfr:= - sys-libs/zlib:= - virtual/libiconv" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/mingw64-runtime-10.0.0-msvcr-extra-race.patch - "${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch - "${FILESDIR}"/gcc-11.3.0-plugin-objdump.patch - "${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 # use ${T} to respect VariableScope for ${D} - local mwtdir=/usr/lib/${PN} - local prefix=${EPREFIX}${mwtdir} - local sysroot=${MWT_D}${prefix} - local -x PATH=${sysroot}/bin:${PATH} - - 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 individual packages handle docs - ) - - # binutils - local conf_binutils=( - --prefix="${prefix}" - --host=${CHOST} - --disable-cet - --disable-default-execstack - --disable-nls - --disable-shared - --with-system-zlib - --without-debuginfod - --without-msgpack - ) - 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-system-zlib - --without-isl - --without-zstd - ) - ${multilib} || conf_gcc+=( --disable-multilib ) - - 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 LD NM OBJCOPY OBJDUMP RANLIB RC STRIP - CHOST=${CTARGET} - filter-flags '-fstack-clash-protection' #758914 - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - - # -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 V=1 - # -j1 to match bug #906155, other packages may be fragile too - emake -j1 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 - - # 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 !debug; then - einfo "Stripping ${CTARGET} static libraries ..." - find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \ - -exec ${CTARGET}-strip --strip-unneeded {} + || die - fi -} - -src_install() { - # use mv over copying given it's ~370MB - mv "${MWT_D}${EPREFIX}"/* "${ED}" || die - - # gcc handles static libs internally without needing .la - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - 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 -} diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0.ebuild deleted file mode 100644 index fe1e24330e9d..000000000000 --- a/dev-util/mingw64-toolchain/mingw64-toolchain-11.0.0.ebuild +++ /dev/null @@ -1,325 +0,0 @@ -# Copyright 2022-2023 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.40 -GCC_PV=13.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=" - mirror://sourceforge/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" -KEYWORDS="-* amd64 x86" -IUSE="+abi_x86_32 custom-cflags debug" - -RDEPEND=" - dev-libs/gmp:= - dev-libs/mpc:= - dev-libs/mpfr:= - sys-libs/zlib:= - virtual/libiconv" -DEPEND="${RDEPEND}" - -QA_CONFIG_IMPL_DECL_SKIP=( - strerror_r # libstdc++ test using -Wimplicit+error -) - -PATCHES=( - "${FILESDIR}"/binutils-2.40-import-lib.patch - "${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 individual packages handle docs - ) - - # 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 ) - - 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 LD NM OBJCOPY OBJDUMP RANLIB RC STRIP - CHOST=${CTARGET} - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - - # -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 V=1 - # -j1 to match bug #906155, other packages may be fragile too - emake -j1 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 - - # 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 !debug; 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() { - 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 -}
