| 1 |
commit: 33d7b158dc01843bd129d0f89cb301d9bf355d0a |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 21 03:31:49 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 17:22:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d7b158 |
| 7 |
|
| 8 |
dev-util/mingw64-runtime: disable widl on unsupported platforms |
| 9 |
|
| 10 |
Not tested, but should work in theory. |
| 11 |
|
| 12 |
Also drop redundant --prefix while here, but keep array so it's |
| 13 |
easy to add option if needed in the future. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/853250 |
| 16 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild | 13 ++++++++----- |
| 19 |
dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild | 13 ++++++++----- |
| 20 |
dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild | 13 ++++++++----- |
| 21 |
3 files changed, 24 insertions(+), 15 deletions(-) |
| 22 |
|
| 23 |
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 |
| 24 |
index 3b3854308f65..a31d8271deb2 100644 |
| 25 |
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild |
| 26 |
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild |
| 27 |
@@ -36,8 +36,13 @@ pkg_setup() { |
| 28 |
mingw-foreach_tool() { |
| 29 |
use !tools || use headers-only && return |
| 30 |
|
| 31 |
- local tool |
| 32 |
- for tool in gendef genidl widl; do |
| 33 |
+ local tool=widl |
| 34 |
+ if use !amd64 && use !x86 && use !arm64 && use !arm; then |
| 35 |
+ einfo "Skipping widl due to unsupported platform" |
| 36 |
+ tool= |
| 37 |
+ fi |
| 38 |
+ |
| 39 |
+ for tool in gendef genidl ${tool}; do |
| 40 |
# not using top-level --with-tools given it skips widl |
| 41 |
pushd mingw-w64-tools/${tool} >/dev/null || die |
| 42 |
"${@}" |
| 43 |
@@ -47,9 +52,7 @@ mingw-foreach_tool() { |
| 44 |
|
| 45 |
src_configure() { |
| 46 |
# native tools, see #644556 |
| 47 |
- local toolsconf=( |
| 48 |
- --prefix="${EPREFIX}"/usr |
| 49 |
- ) |
| 50 |
+ local toolsconf=() |
| 51 |
# normally only widl is prefixed, but avoids clash with other targets |
| 52 |
${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) |
| 53 |
|
| 54 |
|
| 55 |
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 |
| 56 |
index 9efc43518403..4f6695ab77ad 100644 |
| 57 |
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild |
| 58 |
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild |
| 59 |
@@ -38,8 +38,13 @@ pkg_setup() { |
| 60 |
mingw-foreach_tool() { |
| 61 |
use !tools || use headers-only && return |
| 62 |
|
| 63 |
- local tool |
| 64 |
- for tool in gendef genidl widl; do |
| 65 |
+ local tool=widl |
| 66 |
+ if use !amd64 && use !x86 && use !arm64 && use !arm; then |
| 67 |
+ einfo "Skipping widl due to unsupported platform" |
| 68 |
+ tool= |
| 69 |
+ fi |
| 70 |
+ |
| 71 |
+ for tool in gendef genidl ${tool}; do |
| 72 |
# not using top-level --with-tools given it skips widl |
| 73 |
pushd mingw-w64-tools/${tool} >/dev/null || die |
| 74 |
"${@}" |
| 75 |
@@ -49,9 +54,7 @@ mingw-foreach_tool() { |
| 76 |
|
| 77 |
src_configure() { |
| 78 |
# native tools, see #644556 |
| 79 |
- local toolsconf=( |
| 80 |
- --prefix="${EPREFIX}"/usr |
| 81 |
- ) |
| 82 |
+ local toolsconf=() |
| 83 |
# normally only widl is prefixed, but avoids clash with other targets |
| 84 |
${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) |
| 85 |
|
| 86 |
|
| 87 |
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 |
| 88 |
index fbd35d0570b7..4744a6a8a569 100644 |
| 89 |
--- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild |
| 90 |
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild |
| 91 |
@@ -36,8 +36,13 @@ pkg_setup() { |
| 92 |
mingw-foreach_tool() { |
| 93 |
use !tools || use headers-only && return |
| 94 |
|
| 95 |
- local tool |
| 96 |
- for tool in gendef genidl widl; do |
| 97 |
+ local tool=widl |
| 98 |
+ if use !amd64 && use !x86 && use !arm64 && use !arm; then |
| 99 |
+ einfo "Skipping widl due to unsupported platform" |
| 100 |
+ tool= |
| 101 |
+ fi |
| 102 |
+ |
| 103 |
+ for tool in gendef genidl ${tool}; do |
| 104 |
# not using top-level --with-tools given it skips widl |
| 105 |
pushd mingw-w64-tools/${tool} >/dev/null || die |
| 106 |
"${@}" |
| 107 |
@@ -47,9 +52,7 @@ mingw-foreach_tool() { |
| 108 |
|
| 109 |
src_configure() { |
| 110 |
# native tools, see #644556 |
| 111 |
- local toolsconf=( |
| 112 |
- --prefix="${EPREFIX}"/usr |
| 113 |
- ) |
| 114 |
+ local toolsconf=() |
| 115 |
# normally only widl is prefixed, but avoids clash with other targets |
| 116 |
${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) |
Archives