From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AED7B15ACFB for ; Wed, 26 Apr 2023 08:37:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5E45E0876; Wed, 26 Apr 2023 08:37:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89892E0876 for ; Wed, 26 Apr 2023 08:37:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66443340FAB for ; Wed, 26 Apr 2023 08:37:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3BF3A54 for ; Wed, 26 Apr 2023 08:37:45 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1682498210.d40efb39554df7bcabaf53648aa0ee808f680660.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-toolchain/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/mingw64-toolchain/Manifest dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p4.ebuild X-VCS-Directories: dev-util/mingw64-toolchain/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: d40efb39554df7bcabaf53648aa0ee808f680660 X-VCS-Branch: master Date: Wed, 26 Apr 2023 08:37:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 579b3486-89c8-4aea-b674-1665732d82e7 X-Archives-Hash: edf34aac0a172808601a9dfac515ce09 commit: d40efb39554df7bcabaf53648aa0ee808f680660 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Apr 26 08:03:20 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Apr 26 08:36:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40efb39 dev-util/mingw64-toolchain: add 10.0.0_p4 w/ gcc-13.1.0 (keyworded) Been using _p3 with a bit earlier 13 pre-release + binutils-2.40 with Wine for a bit and no known issues at the moment. Closes: https://bugs.gentoo.org/898778 Signed-off-by: Ionen Wolkens gentoo.org> dev-util/mingw64-toolchain/Manifest | 1 + .../mingw64-toolchain-10.0.0_p4.ebuild | 321 +++++++++++++++++++++ 2 files changed, 322 insertions(+) diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest index b3f53ced509a..a521d157a1ce 100644 --- a/dev-util/mingw64-toolchain/Manifest +++ b/dev-util/mingw64-toolchain/Manifest @@ -2,4 +2,5 @@ DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79ed DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 DIST gcc-13-20230416.tar.xz 83936936 BLAKE2B c052fff2838a0bdd87f90345a5f7f5c607a6fe360b02ce8cb076f6dd3a62f6aae0c7d3914eee447e9c92c971331ddcbf0c94f2aa120aef89a742162b5e7dbfdd SHA512 222bb6db05b23aeb428262c69319a4964097065a88a5ae6c19b104c31af82c465f139c08f01bb077b0e776685769b77a54b772ebc4e2057e7c3e8954283997cf +DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516 diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p4.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p4.ebuild new file mode 100644 index 000000000000..daed2fea783e --- /dev/null +++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p4.ebuild @@ -0,0 +1,321 @@ +# 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}"/mingw64-runtime-10.0.0-msvcr-extra-race.patch + "${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch + "${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] [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 + 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 + emake 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 +}