summaryrefslogtreecommitdiff
path: root/dev-util/mingw64-runtime
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/mingw64-runtime')
-rw-r--r--dev-util/mingw64-runtime/Manifest11
-rw-r--r--dev-util/mingw64-runtime/metadata.xml4
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild120
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild118
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild120
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild122
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-8.0.0.ebuild118
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild120
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild119
9 files changed, 371 insertions, 481 deletions
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index add9a13c2952..7eec69ce715e 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,11 +1,10 @@
AUX mingw64-runtime-7.0.0-fortify-only-ssp.patch 637 BLAKE2B 3a8eff14b3150446da51354324a3b29e327982fd586339e5f8df4309de2bbdb2722773e0d145d87363183ff70fd02fcdcbc46c560bef9a5111dc33ee8105bede SHA512 991d4294d81a05bfa86d2bed102b3f5bf58435ef02b0a38abe905cc4a0416896b01ffc3a2fe64e78d44e78c9c65051428426b7d19561bd337a229bf7281c7040
AUX mingw64-runtime-8.0.0-__rdtsc.patch 773 BLAKE2B 8ec970049ee9d1003caed099a6eb0301f066cd3f0986895f08b2912b14248d3c41c87558a1df40b7f452e73d382da73215942827f4e5e551df65d779eda23eef SHA512 df986f2b24ea1e4db7babad2a837a55a59e1abd20f41ef03f438907477829561238a69fa8e8891ede1a45eef6dca36deb82c6be61293ce0f39e7f94f82483cad
AUX mingw64-runtime-8.0.0-udivmod.patch 865 BLAKE2B 848b45fb68c775baa5b285293df0a986a11f98e1768f4a55e7c22bd870f1df12d60fd03c378d1fe24e5049886a48527aee894e1f0d58555cc686a807815a3a7b SHA512 0d5c27e8b30efd8b0e938f66f0fd8ddc2a279c79a1ae99d776fc2b1595f97489083f8cc2caa6c3d78ed7a0394e707efe6e6792fec768e90dc170ac6c9fc84146
-DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
+DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386
-EBUILD mingw64-runtime-7.0.0-r1.ebuild 2982 BLAKE2B 8f053374e0a9efb5d5bf80f2da61ba9e3c5b4fdc46c70b68bea330dff90e35aa1063b2a46634344c32af369f3f595220a5546b06f07cca8f9684a75be1330e49 SHA512 207053be905bba9e9a956d1c0fa3d4ba10280e3c92ad958f0aa3b9408ab6473333dabb6472d5217ccdfb5f4fc8343bc80f4728105b708ec75071772226ae1099
-EBUILD mingw64-runtime-8.0.0-r1.ebuild 3071 BLAKE2B 01f5baf3d0a946a1f6c4c02015fec37aea6a63537396f92117f97914097d3b488df02182a7e9e49f2810b9c986df5e8b50138e2e11ae025066f878f4e365654c SHA512 88febe6ea32f2241bdaf44cea8870b9f522263c5fbea9429d93c7fc1225c845b69a9e7e83cffa82cdb1a7abe3dabde27efef83d220cb7183b389064725fa8a19
-EBUILD mingw64-runtime-8.0.0.ebuild 2989 BLAKE2B eff772061575f14ffcc9b85a1c6d4658eb2854b19a9b103eecb8e579bbf44e31084c1e915dff3415cecfcf0ae3e41444c31b7f4d5a5559c9c0addd2a94129999 SHA512 baff94670008ee2e907924fa7c0cc6c86f7902ceb60fe39e53a4d6d3b3a093bfce0270b89bc2a11ef0c11e724d1e3fd90de04b1ab0ae3b40cb934971d834f4e3
-EBUILD mingw64-runtime-9.0.0.ebuild 3030 BLAKE2B 9a90af1f77827b0fb93194b28d115cd32a0ea45f78366bb07c19b8536ed93b7059fc8eaf85537988779b2a30e7cc0738306c713be944e22b27a0250cbe298bc7 SHA512 0892656f775b1d550ca486a2a02703caf4d56c46c7dd96f7e66f10b260062a97759d2e2cb5e690b1a809e8c6b09c5d3a4e4a0f98c2dac479ce6c67feb490e210
-MISC metadata.xml 564 BLAKE2B 80c27f80ef66df6f54f043bfce48a9f18d6965a6521032dd1d88abd51ccecf868157c943068ab8b12e3b8c5ee6034a9a28f58fed61289799de47159eb7f4449d SHA512 08aa87d7d08581508493a0649ffd176a76225596f8d5b056a4095a1ed0482202327cf9a3f50e7cc6029e7b528eb68b9679d937e421b6c28d95a08b565d109a2d
+EBUILD mingw64-runtime-10.0.0.ebuild 3071 BLAKE2B fdbb874b182c86e125ce54b575cb683270b221cb7cea568733784a25c8c48a97bdbaa6d783ae05d4e0e095bd52f5a877e2d0f3532a54b7183e12bd27c24a67fb SHA512 c94d482c0bee8fdcd1a45a8fd527cffba3fc546149555163e8c8fc838c977e6ce21acd703cdf4771ac9179e060fc163728dbca503121077fe3f6a7840dc57373
+EBUILD mingw64-runtime-8.0.0-r2.ebuild 3139 BLAKE2B e4ba23887bdc3152f5892e628a76aec7d4df2214f8e64c6783b6b77f63071572851b5ef5c734e9aceb0a48bf7fed214070b12f2be74ee9343edbc17c25ea3561 SHA512 8024896d0d111be6dae9e003a90cfe33e21b72e21230ff45372a22a1eac60c9c21c9b54b9696035e5266069cb1ab2d78dff72f1e4ef5f990829022a76f485c6d
+EBUILD mingw64-runtime-9.0.0-r1.ebuild 3071 BLAKE2B fdbb874b182c86e125ce54b575cb683270b221cb7cea568733784a25c8c48a97bdbaa6d783ae05d4e0e095bd52f5a877e2d0f3532a54b7183e12bd27c24a67fb SHA512 c94d482c0bee8fdcd1a45a8fd527cffba3fc546149555163e8c8fc838c977e6ce21acd703cdf4771ac9179e060fc163728dbca503121077fe3f6a7840dc57373
+MISC metadata.xml 676 BLAKE2B f799f3635f3b3ee45700c4b477e80f345473fb3b5e65a70168747ed6064ae984000d84be368de632a231b2994003650028201a30c9b06463e821957510b0f9d3 SHA512 c6789e67985aebdc9216837e109d14eff760cb3f4563c08d3c171e3755f3d49c5a2ae7321cc596ef27ae43bd7d918626443108a1332abc86aee82763fc0045b8
diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index c698f9ad9b0b..e2958c042969 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
+ <name>Ionen Wolkens</name>
+ </maintainer>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild
new file mode 100644
index 000000000000..077a2a52ccd6
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]]; then
+ export CTARGET=${CATEGORY#cross-}
+fi
+
+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="headers-only idl libraries tools"
+RESTRICT="strip"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
+)
+
+mingw-is_cross() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+ if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]]; then
+ die "Invalid configuration"
+ fi
+}
+
+src_configure() {
+ CHOST=${CTARGET} strip-unsupported-flags
+
+ # Normally mingw-64 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=*'
+
+ if use !headers-only; then
+ mkdir "${WORKDIR}"/headers || die
+ pushd "${WORKDIR}"/headers >/dev/null || die
+
+ local econfargs=(
+ --prefix="${T}"/tmproot
+ --with-headers
+ --without-crt
+ )
+
+ CHOST=${CTARGET} ECONF_SOURCE=${S} econf "${econfargs[@]}"
+
+ popd >/dev/null || die
+
+ append-cppflags "-I${T}/tmproot/include"
+ fi
+
+ crt-use_enable() {
+ use headers-only && echo --without-${2:-${1}} || use_enable "${@}"
+ }
+ crt-use_with() {
+ use headers-only && echo --without-${2:-${1}} || use_with "${@}"
+ }
+
+ local prefix="${EPREFIX}"$(mingw-is_cross && echo /usr/${CTARGET})/usr
+ local econfargs=(
+ --prefix="${prefix}"
+ --libdir="${prefix}"/lib
+ --enable-sdk
+ --with-headers
+
+ # 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
+
+ $(use_with !headers-only crt)
+ $(crt-use_enable idl)
+ $(crt-use_with libraries)
+ $(crt-use_with tools)
+ $(
+ if use !headers-only; then
+ # not checking cpp errors due to bug #840662
+ $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ \
+ && echo --disable-lib32 --enable-lib64 \
+ || echo --enable-lib32 --disable-lib64
+ fi
+ )
+ )
+
+ CHOST=${CTARGET} econf "${econfargs[@]}"
+}
+
+src_compile() {
+ use headers-only || emake -C "${WORKDIR}"/headers install
+
+ default
+}
+
+src_install() {
+ default
+
+ if mingw-is_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-7.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild
deleted file mode 100644
index d54697c1b686..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE=libraries needs working stage2 compiler: bug #665512
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fortify-only-ssp.patch
-)
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only
-}
-alt_prefix() {
- is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
- just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
- just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
- just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_configure() {
- CHOST=${CTARGET} strip-unsupported-flags
- # Normally mingw-64 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=*'
-
- if ! just_headers; then
- mkdir "${WORKDIR}/headers"
- pushd "${WORKDIR}/headers" > /dev/null
- CHOST=${CTARGET} "${S}/configure" \
- --prefix="${T}/tmproot" \
- --with-headers \
- --without-crt \
- || die
- popd > /dev/null
- append-cppflags "-I${T}/tmproot/include"
- fi
-
- # 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.
- local prefix="${EPREFIX}"$(alt_prefix)/usr
- CHOST=${CTARGET} econf \
- --with-sysroot=no \
- --prefix="${prefix}" \
- --libdir="${prefix}"/lib \
- --with-headers \
- --enable-sdk \
- $(crt_with crt) \
- $(crt_use_enable idl idl) \
- $(crt_use_with libraries libraries) \
- $(crt_use_with tools tools) \
- $(
- $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
- && echo --disable-lib32 --enable-lib64 \
- || echo --enable-lib32 --disable-lib64
- )
-}
-
-src_compile() {
- if ! just_headers; then
- emake -C "${WORKDIR}/headers" install
- fi
- default
-}
-
-src_install() {
- default
-
- if is_crosscompile ; 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 -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild
deleted file mode 100644
index 66146673f8ce..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE=libraries needs working stage2 compiler: bug #665512
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
- "${FILESDIR}"/${PN}-8.0.0-__rdtsc.patch
- "${FILESDIR}"/${PN}-8.0.0-udivmod.patch
-)
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only
-}
-alt_prefix() {
- is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
- just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
- just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
- just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_configure() {
- CHOST=${CTARGET} strip-unsupported-flags
- # Normally mingw-64 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=*'
-
- if ! just_headers; then
- mkdir "${WORKDIR}/headers"
- pushd "${WORKDIR}/headers" > /dev/null
- CHOST=${CTARGET} "${S}/configure" \
- --prefix="${T}/tmproot" \
- --with-headers \
- --without-crt \
- || die
- popd > /dev/null
- append-cppflags "-I${T}/tmproot/include"
- fi
-
- # 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.
- local prefix="${EPREFIX}"$(alt_prefix)/usr
- CHOST=${CTARGET} econf \
- --with-sysroot=no \
- --prefix="${prefix}" \
- --libdir="${prefix}"/lib \
- --with-headers \
- --enable-sdk \
- $(crt_with crt) \
- $(crt_use_enable idl idl) \
- $(crt_use_with libraries libraries) \
- $(crt_use_with tools tools) \
- $(
- $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
- && echo --disable-lib32 --enable-lib64 \
- || echo --enable-lib32 --disable-lib64
- )
-}
-
-src_compile() {
- if ! just_headers; then
- emake -C "${WORKDIR}/headers" install
- fi
- default
-}
-
-src_install() {
- default
-
- if is_crosscompile ; 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 -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild
new file mode 100644
index 000000000000..8b0afea5649a
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]]; then
+ export CTARGET=${CATEGORY#cross-}
+fi
+
+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="headers-only idl libraries tools"
+RESTRICT="strip"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
+ "${FILESDIR}"/${P}-__rdtsc.patch
+ "${FILESDIR}"/${P}-udivmod.patch
+)
+
+mingw-is_cross() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+ if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]]; then
+ die "Invalid configuration"
+ fi
+}
+
+src_configure() {
+ CHOST=${CTARGET} strip-unsupported-flags
+
+ # Normally mingw-64 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=*'
+
+ if use !headers-only; then
+ mkdir "${WORKDIR}"/headers || die
+ pushd "${WORKDIR}"/headers >/dev/null || die
+
+ local econfargs=(
+ --prefix="${T}"/tmproot
+ --with-headers
+ --without-crt
+ )
+
+ CHOST=${CTARGET} ECONF_SOURCE=${S} econf "${econfargs[@]}"
+
+ popd >/dev/null || die
+
+ append-cppflags "-I${T}/tmproot/include"
+ fi
+
+ crt-use_enable() {
+ use headers-only && echo --without-${2:-${1}} || use_enable "${@}"
+ }
+ crt-use_with() {
+ use headers-only && echo --without-${2:-${1}} || use_with "${@}"
+ }
+
+ local prefix="${EPREFIX}"$(mingw-is_cross && echo /usr/${CTARGET})/usr
+ local econfargs=(
+ --prefix="${prefix}"
+ --libdir="${prefix}"/lib
+ --enable-sdk
+ --with-headers
+
+ # 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
+
+ $(use_with !headers-only crt)
+ $(crt-use_enable idl)
+ $(crt-use_with libraries)
+ $(crt-use_with tools)
+ $(
+ if use !headers-only; then
+ # not checking cpp errors due to bug #840662
+ $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ \
+ && echo --disable-lib32 --enable-lib64 \
+ || echo --enable-lib32 --disable-lib64
+ fi
+ )
+ )
+
+ CHOST=${CTARGET} econf "${econfargs[@]}"
+}
+
+src_compile() {
+ use headers-only || emake -C "${WORKDIR}"/headers install
+
+ default
+}
+
+src_install() {
+ default
+
+ if mingw-is_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-8.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0.ebuild
deleted file mode 100644
index 2db84fb513eb..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE=libraries needs working stage2 compiler: bug #665512
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
-)
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only
-}
-alt_prefix() {
- is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
- just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
- just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
- just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_configure() {
- CHOST=${CTARGET} strip-unsupported-flags
- # Normally mingw-64 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=*'
-
- if ! just_headers; then
- mkdir "${WORKDIR}/headers"
- pushd "${WORKDIR}/headers" > /dev/null
- CHOST=${CTARGET} "${S}/configure" \
- --prefix="${T}/tmproot" \
- --with-headers \
- --without-crt \
- || die
- popd > /dev/null
- append-cppflags "-I${T}/tmproot/include"
- fi
-
- # 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.
- local prefix="${EPREFIX}"$(alt_prefix)/usr
- CHOST=${CTARGET} econf \
- --with-sysroot=no \
- --prefix="${prefix}" \
- --libdir="${prefix}"/lib \
- --with-headers \
- --enable-sdk \
- $(crt_with crt) \
- $(crt_use_enable idl idl) \
- $(crt_use_with libraries libraries) \
- $(crt_use_with tools tools) \
- $(
- $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
- && echo --disable-lib32 --enable-lib64 \
- || echo --enable-lib32 --disable-lib64
- )
-}
-
-src_compile() {
- if ! just_headers; then
- emake -C "${WORKDIR}/headers" install
- fi
- default
-}
-
-src_install() {
- default
-
- if is_crosscompile ; 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 -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild
new file mode 100644
index 000000000000..077a2a52ccd6
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]]; then
+ export CTARGET=${CATEGORY#cross-}
+fi
+
+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="headers-only idl libraries tools"
+RESTRICT="strip"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
+)
+
+mingw-is_cross() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+pkg_setup() {
+ if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]]; then
+ die "Invalid configuration"
+ fi
+}
+
+src_configure() {
+ CHOST=${CTARGET} strip-unsupported-flags
+
+ # Normally mingw-64 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=*'
+
+ if use !headers-only; then
+ mkdir "${WORKDIR}"/headers || die
+ pushd "${WORKDIR}"/headers >/dev/null || die
+
+ local econfargs=(
+ --prefix="${T}"/tmproot
+ --with-headers
+ --without-crt
+ )
+
+ CHOST=${CTARGET} ECONF_SOURCE=${S} econf "${econfargs[@]}"
+
+ popd >/dev/null || die
+
+ append-cppflags "-I${T}/tmproot/include"
+ fi
+
+ crt-use_enable() {
+ use headers-only && echo --without-${2:-${1}} || use_enable "${@}"
+ }
+ crt-use_with() {
+ use headers-only && echo --without-${2:-${1}} || use_with "${@}"
+ }
+
+ local prefix="${EPREFIX}"$(mingw-is_cross && echo /usr/${CTARGET})/usr
+ local econfargs=(
+ --prefix="${prefix}"
+ --libdir="${prefix}"/lib
+ --enable-sdk
+ --with-headers
+
+ # 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
+
+ $(use_with !headers-only crt)
+ $(crt-use_enable idl)
+ $(crt-use_with libraries)
+ $(crt-use_with tools)
+ $(
+ if use !headers-only; then
+ # not checking cpp errors due to bug #840662
+ $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - </dev/null | grep -q __MINGW64__ \
+ && echo --disable-lib32 --enable-lib64 \
+ || echo --enable-lib32 --disable-lib64
+ fi
+ )
+ )
+
+ CHOST=${CTARGET} econf "${econfargs[@]}"
+}
+
+src_compile() {
+ use headers-only || emake -C "${WORKDIR}"/headers install
+
+ default
+}
+
+src_install() {
+ default
+
+ if mingw-is_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-9.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild
deleted file mode 100644
index 3dfff3894bf5..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE=libraries needs working stage2 compiler: bug #665512
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
- "${FILESDIR}"/${PN}-8.0.0-__rdtsc.patch
-)
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
- use headers-only
-}
-alt_prefix() {
- is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
- just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
- just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
- just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
- if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
- die "Invalid configuration"
- fi
-}
-
-src_configure() {
- CHOST=${CTARGET} strip-unsupported-flags
- # Normally mingw-64 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=*'
-
- if ! just_headers; then
- mkdir "${WORKDIR}/headers"
- pushd "${WORKDIR}/headers" > /dev/null
- CHOST=${CTARGET} "${S}/configure" \
- --prefix="${T}/tmproot" \
- --with-headers \
- --without-crt \
- || die
- popd > /dev/null
- append-cppflags "-I${T}/tmproot/include"
- fi
-
- # 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.
- local prefix="${EPREFIX}"$(alt_prefix)/usr
- CHOST=${CTARGET} econf \
- --with-sysroot=no \
- --prefix="${prefix}" \
- --libdir="${prefix}"/lib \
- --with-headers \
- --enable-sdk \
- $(crt_with crt) \
- $(crt_use_enable idl idl) \
- $(crt_use_with libraries libraries) \
- $(crt_use_with tools tools) \
- $(
- $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
- && echo --disable-lib32 --enable-lib64 \
- || echo --enable-lib32 --disable-lib64
- )
-}
-
-src_compile() {
- if ! just_headers; then
- emake -C "${WORKDIR}/headers" install
- fi
- default
-}
-
-src_install() {
- default
-
- if is_crosscompile ; 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 -rf "${ED}/usr/share"
-}