[gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-runtime/

[Ionen Wolkens]

commit:     e6b9f70fbaf9f22ab15d466155d4e0f13351ec81
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 01:08:42 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 01:56:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b9f70f

dev-util/mingw64-runtime: nitpicks and add default-ucrt warning

Technically this can be considered a different CTARGET (believe
some do x86_64-w64-mingw32ucrt) and, bit like clang's default-libcxx,
shouldn't be casually swapped (but attempts are likely to fail).

Also cleanup metadata full stops and add widl while here.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-util/mingw64-runtime/metadata.xml                     | 11 +++++++----
 dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev-util/mingw64-runtime/metadata.xml 
b/dev-util/mingw64-runtime/metadata.xml
index 9614bd8a4369..b1a857e80f12 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -10,10 +10,13 @@
     <name>Gentoo Toolchain Project</name>
   </maintainer>
   <use>
-    <flag name="default-ucrt">Use ucrt instead of msvcrt-os as the default 
crt.</flag>
-    <flag name="idl">Install idl files.</flag>
-    <flag name="libraries">Build extra libraries: mangle, pseh, 
winpthreads.</flag>
-    <flag name="tools">Build extra tools: gendef, genidl.</flag>
+    <flag name="default-ucrt">
+      Use ucrt instead of msvcrt-os as the default crt (WARNING:
+      incompatible with each others and also for building Wine with
+      USE=mingw, pick one from the start and keep it)</flag>
+    <flag name="idl">Install idl files</flag>
+    <flag name="libraries">Build extra libraries: mangle, pseh, 
winpthreads</flag>
+    <flag name="tools">Build extra tools: gendef, genidl, widl</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">mingw-w64</remote-id>

diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild 
b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
index 51a541b4ad11..3b3854308f65 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
@@ -76,8 +76,8 @@ src_configure() {
        local conf=(
                --prefix="${prefix}"
                --libdir="${prefix}"/lib
-               $(usex default-ucrt "--with-default-msvcrt=ucrt" "")
                $(use_with !headers-only crt)
+               $(usev default-ucrt --with-default-msvcrt=ucrt)
 
                # By default configure tries to set --sysroot=${prefix}. We 
disable
                # this behaviour with --with-sysroot=no to use gcc's sysroot 
default.