From 289f1b26cc418e64d838c0014e838c56fa368c8a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Aug 2022 20:39:37 +0100 Subject: gentoo auto-resync : 20:08:2022 - 20:39:37 --- dev-util/mingw64-toolchain/Manifest | 5 +- .../mingw64-toolchain-10.0.0-r1.ebuild | 17 +- .../mingw64-toolchain-10.0.0_p1.ebuild | 301 +++++++++++++++++++++ 3 files changed, 309 insertions(+), 14 deletions(-) create mode 100644 dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild (limited to 'dev-util/mingw64-toolchain') diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest index 49c42b374503..426bea1db4df 100644 --- a/dev-util/mingw64-toolchain/Manifest +++ b/dev-util/mingw64-toolchain/Manifest @@ -2,7 +2,10 @@ AUX gcc-11.3.0-musl-calloc.patch 812 BLAKE2B a9e77f042ef5e0843535009a922ef1aaa57 AUX gcc-11.3.0-plugin-objdump.patch 762 BLAKE2B c98cec68476fd3c5922c8b84a5f971e86d20f8e47da2923e929b7852da62ffaa45d0ed78c7326e9b4319696d11478f2aac1fabd7ddb6688d85f9b6e686a37120 SHA512 a012c01f54a6db490ae06cde80696fbdc750e937e54f2848d43c920ecdd3365f57197ff08b818d6d2d8423bfe5b31b440642a99fc34506d99588ab6703c95286 AUX mingw64-runtime-10.0.0-tmp-files-clash.patch 572 BLAKE2B c0604bf4bcc3de23a4144bb1482e824c145e51e19468489702002c8d0e446dbd896424d1cd498329e144892e46349286d3d9fdf257a1cc181ee0ea6f87a25b3c SHA512 01eb77360b609a32bfa65da5b4ca4c737144514c43d1d05b462e2dec8051aef921fde23ec2c39c17444464ba46354dbe109e9267b8fa77a929be1550711290fd DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 +DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 +DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516 -EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9639 BLAKE2B 36f6fbd2e38f94cea3787225d3e474e63ad04d776d57ff6ce2a9f994772c1a75e95836effdb99b0f9295f956557a10bbd4f517097cdc2953912c40b776fb8911 SHA512 a0dc4070a88969e9bf7fc11d0d80dec201984767370a05ecc11588c498159a82d7806a01b2cf454745fd1fb4b98c372ff45a5e697d6fea2b86026eb742666de8 +EBUILD mingw64-toolchain-10.0.0-r1.ebuild 9328 BLAKE2B e91bd2477f615bf385b3fda1b35e3628848e33d3bcf8182c9d7726d91f1f10e2ba987b9beb4c3a241c2bdd9d61cc7bba430374ecad823db89ce34038035f915b SHA512 69bcac9b4199e037814465fae9aea75cf6197e6bc02f810ec55a57455d740a893f77332afb33fa12168ed6735039e8a7829b18d1838be00cb1afba6979495cc2 +EBUILD mingw64-toolchain-10.0.0_p1.ebuild 9312 BLAKE2B 9ff31f32c8d33d0934f72e1d5c6e1425523ab5a7175d7def1d3030fa828e61229d4364fe98e4eda69ab2332f0e65af8c5d586840ff896785d3698b5ccd7ac6c9 SHA512 0838259a07e7331bbad432ae25aa832b7846406e722959436268e4c9718dcc07dda4ac4a21230497ca23e7ac63daf2ef07a6c003dcde600e2a421640f60067da MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313 diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild index 1af4218042da..2ae2ce9b80cb 100644 --- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild +++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0-r1.ebuild @@ -12,6 +12,7 @@ inherit edo flag-o-matic multilib-build toolchain-funcs # Do _p1++ rather than revbump if changing without bumping mingw64 itself. BINUTILS_PV=2.37 # 2.38 needs bug #838106 GCC_PV=11.3.0 +MINGW_PV=$(ver_cut 1-3) DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev" HOMEPAGE=" @@ -19,7 +20,7 @@ HOMEPAGE=" https://gcc.gnu.org/ https://sourceware.org/binutils/" SRC_URI=" - mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2 + 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}" @@ -58,7 +59,7 @@ 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${PV} mingw64 || die + mv mingw-w64-v${MINGW_PV} mingw64 || die default } @@ -99,13 +100,6 @@ src_compile() { --without-debuginfod ) mwt-binutils() { - # replace duplicates with symlinks - local bin - for bin in "${sysroot}"/${CTARGET}/bin/*; do - ln -sf {../${CTARGET}/bin/,"${sysroot}"/bin/${CTARGET}-}${bin##*/} || die - done - ln -sf ld.bfd "${sysroot}"/${CTARGET}/bin/ld || die - # symlink gcc's lto plugin for AR (bug #854516) mkdir "${sysroot}"/${CTARGET}/lib/bfd-plugins || die ln -s ../../../libexec/gcc/${CTARGET}/${GCC_PV}/liblto_plugin.so \ @@ -125,6 +119,7 @@ src_compile() { --disable-libssp --disable-libvtv --disable-shared + --disable-werror --with-system-zlib --without-isl --without-zstd @@ -144,10 +139,6 @@ src_compile() { --with-sysroot="${prefix}" --with-build-sysroot="${sysroot}" ) - mwt-gcc_stage3() { - # replace duplicate with symlink - ln -sf ${CTARGET}-gcc "${sysroot}"/bin/${CTARGET}-gcc-${GCC_PV} || die - } # mingw64-runtime (split in several parts, 3 needed for gcc stages) local conf_mingw64=( diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild new file mode 100644 index 000000000000..2f07f8f08e07 --- /dev/null +++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1.ebuild @@ -0,0 +1,301 @@ +# Copyright 2022 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-tmp-files-clash.patch + "${FILESDIR}"/gcc-11.3.0-plugin-objdump.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) + mkdir "${sysroot}"/${CTARGET}/lib/bfd-plugins || die + ln -s ../../../libexec/gcc/${CTARGET}/${GCC_PV}/liblto_plugin.so \ + "${sysroot}"/${CTARGET}/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] [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=*' + 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 + eval ' + local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" ) + [[ ${conf_'${id}'@a} =~ a ]] && conf+=( "${conf_'${id}'[@]}" ) + [[ ${2} && ${conf_'${id}_${2}'@a} =~ a ]] && conf+=( "${conf_'${id}_${2}'[@]}" ) + conf+=( ${EXTRA_ECONF} ${MWT_'${id^^}'_CONF} ) + [[ ${2} ]] && conf+=( ${MWT_'${1^^}_${2^^}'_CONF} )' + + einfo "Building ${id}${2+ ${2}} in ${build_dir} ..." + + mkdir "${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 + } + + # 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 + 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 "Please use sys-devel/crossdev for 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 +} -- cgit v1.2.3