commit: 33d7b158dc01843bd129d0f89cb301d9bf355d0a Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Jun 21 03:31:49 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Jun 29 17:22:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d7b158
dev-util/mingw64-runtime: disable widl on unsupported platforms Not tested, but should work in theory. Also drop redundant --prefix while here, but keep array so it's easy to add option if needed in the future. Closes: https://bugs.gentoo.org/853250 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild | 13 ++++++++----- dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild | 13 ++++++++----- dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild | 13 ++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) 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 3b3854308f65..a31d8271deb2 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 @@ -36,8 +36,13 @@ pkg_setup() { mingw-foreach_tool() { use !tools || use headers-only && return - local tool - for tool in gendef genidl widl; do + local tool=widl + if use !amd64 && use !x86 && use !arm64 && use !arm; then + einfo "Skipping widl due to unsupported platform" + tool= + fi + + for tool in gendef genidl ${tool}; do # not using top-level --with-tools given it skips widl pushd mingw-w64-tools/${tool} >/dev/null || die "${@}" @@ -47,9 +52,7 @@ mingw-foreach_tool() { src_configure() { # native tools, see #644556 - local toolsconf=( - --prefix="${EPREFIX}"/usr - ) + local toolsconf=() # normally only widl is prefixed, but avoids clash with other targets ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild index 9efc43518403..4f6695ab77ad 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild @@ -38,8 +38,13 @@ pkg_setup() { mingw-foreach_tool() { use !tools || use headers-only && return - local tool - for tool in gendef genidl widl; do + local tool=widl + if use !amd64 && use !x86 && use !arm64 && use !arm; then + einfo "Skipping widl due to unsupported platform" + tool= + fi + + for tool in gendef genidl ${tool}; do # not using top-level --with-tools given it skips widl pushd mingw-w64-tools/${tool} >/dev/null || die "${@}" @@ -49,9 +54,7 @@ mingw-foreach_tool() { src_configure() { # native tools, see #644556 - local toolsconf=( - --prefix="${EPREFIX}"/usr - ) + local toolsconf=() # normally only widl is prefixed, but avoids clash with other targets ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild index fbd35d0570b7..4744a6a8a569 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild @@ -36,8 +36,13 @@ pkg_setup() { mingw-foreach_tool() { use !tools || use headers-only && return - local tool - for tool in gendef genidl widl; do + local tool=widl + if use !amd64 && use !x86 && use !arm64 && use !arm; then + einfo "Skipping widl due to unsupported platform" + tool= + fi + + for tool in gendef genidl ${tool}; do # not using top-level --with-tools given it skips widl pushd mingw-w64-tools/${tool} >/dev/null || die "${@}" @@ -47,9 +52,7 @@ mingw-foreach_tool() { src_configure() { # native tools, see #644556 - local toolsconf=( - --prefix="${EPREFIX}"/usr - ) + local toolsconf=() # normally only widl is prefixed, but avoids clash with other targets ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- )
