| 1 |
commit: d59f05977cf91d0873b7a91a84c2811ae60302ff |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 18 02:35:09 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 20 20:01:46 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59f0597 |
| 7 |
|
| 8 |
app-emulation/wine-vanilla: improve cross *FLAGS handling |
| 9 |
|
| 10 |
Given wine will switch compiler, need to ensure unsupported flags were |
| 11 |
stripped so that e.g. clang-specific flags won't cause a build failure. |
| 12 |
|
| 13 |
strip-unsupported-flags doesn't act on CROSSCFLAGS, so use test-* |
| 14 |
directly. Using := assignment so that users can override. |
| 15 |
|
| 16 |
Additionally allowing LDFLAGS, there's not much to gain from it |
| 17 |
but as long as unsupported is stripped it should cause no issues. |
| 18 |
|
| 19 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 20 |
|
| 21 |
app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild | 6 +++++- |
| 22 |
app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild | 6 +++++- |
| 23 |
app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild | 6 +++++- |
| 24 |
app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild | 6 +++++- |
| 25 |
app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild | 6 +++++- |
| 26 |
app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild | 6 +++++- |
| 27 |
app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild | 6 +++++- |
| 28 |
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 6 +++++- |
| 29 |
8 files changed, 40 insertions(+), 8 deletions(-) |
| 30 |
|
| 31 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild |
| 32 |
index 9810db168765..807ee258f16e 100644 |
| 33 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild |
| 34 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.2.ebuild |
| 35 |
@@ -305,7 +305,11 @@ src_configure() { |
| 36 |
if use mingw; then |
| 37 |
use crossdev-mingw || PATH=${EPREFIX}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 38 |
|
| 39 |
- export CROSSCFLAGS="${CFLAGS}" |
| 40 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 41 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 42 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 43 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 44 |
+ export CROSS{C,LD}FLAGS |
| 45 |
fi |
| 46 |
|
| 47 |
multilib-minimal_src_configure |
| 48 |
|
| 49 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild |
| 50 |
index 1992efdf9908..65ad27032112 100644 |
| 51 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild |
| 52 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r2.ebuild |
| 53 |
@@ -296,7 +296,11 @@ src_configure() { |
| 54 |
if use mingw; then |
| 55 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 56 |
|
| 57 |
- export CROSSCFLAGS="${CFLAGS}" |
| 58 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 59 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 60 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 61 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 62 |
+ export CROSS{C,LD}FLAGS |
| 63 |
fi |
| 64 |
|
| 65 |
multilib-minimal_src_configure |
| 66 |
|
| 67 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild |
| 68 |
index 74051ef469f0..d1b64ae6c268 100644 |
| 69 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild |
| 70 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild |
| 71 |
@@ -295,7 +295,11 @@ src_configure() { |
| 72 |
if use mingw; then |
| 73 |
use crossdev-mingw || PATH=${EPREFIX}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 74 |
|
| 75 |
- export CROSSCFLAGS="${CFLAGS}" |
| 76 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 77 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 78 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 79 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 80 |
+ export CROSS{C,LD}FLAGS |
| 81 |
fi |
| 82 |
|
| 83 |
multilib-minimal_src_configure |
| 84 |
|
| 85 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild |
| 86 |
index e6242d06fb43..0d667bb08b98 100644 |
| 87 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild |
| 88 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.5-r1.ebuild |
| 89 |
@@ -297,7 +297,11 @@ src_configure() { |
| 90 |
if use mingw; then |
| 91 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 92 |
|
| 93 |
- export CROSSCFLAGS="${CFLAGS}" |
| 94 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 95 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 96 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 97 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 98 |
+ export CROSS{C,LD}FLAGS |
| 99 |
fi |
| 100 |
|
| 101 |
multilib-minimal_src_configure |
| 102 |
|
| 103 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild |
| 104 |
index b0609a8bff36..c097218912e6 100644 |
| 105 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild |
| 106 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.6-r1.ebuild |
| 107 |
@@ -296,7 +296,11 @@ src_configure() { |
| 108 |
if use mingw; then |
| 109 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 110 |
|
| 111 |
- export CROSSCFLAGS="${CFLAGS}" |
| 112 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 113 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 114 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 115 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 116 |
+ export CROSS{C,LD}FLAGS |
| 117 |
fi |
| 118 |
|
| 119 |
multilib-minimal_src_configure |
| 120 |
|
| 121 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild |
| 122 |
index b0609a8bff36..c097218912e6 100644 |
| 123 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild |
| 124 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.7.ebuild |
| 125 |
@@ -296,7 +296,11 @@ src_configure() { |
| 126 |
if use mingw; then |
| 127 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 128 |
|
| 129 |
- export CROSSCFLAGS="${CFLAGS}" |
| 130 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 131 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 132 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 133 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 134 |
+ export CROSS{C,LD}FLAGS |
| 135 |
fi |
| 136 |
|
| 137 |
multilib-minimal_src_configure |
| 138 |
|
| 139 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild |
| 140 |
index 25c7af87ecba..6793bf6d1852 100644 |
| 141 |
--- a/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild |
| 142 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.8.ebuild |
| 143 |
@@ -294,7 +294,11 @@ src_configure() { |
| 144 |
if use mingw; then |
| 145 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 146 |
|
| 147 |
- export CROSSCFLAGS="${CFLAGS}" |
| 148 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 149 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 150 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 151 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 152 |
+ export CROSS{C,LD}FLAGS |
| 153 |
fi |
| 154 |
|
| 155 |
multilib-minimal_src_configure |
| 156 |
|
| 157 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 158 |
index 25c7af87ecba..6793bf6d1852 100644 |
| 159 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 160 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 161 |
@@ -294,7 +294,11 @@ src_configure() { |
| 162 |
if use mingw; then |
| 163 |
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} |
| 164 |
|
| 165 |
- export CROSSCFLAGS="${CFLAGS}" |
| 166 |
+ # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) |
| 167 |
+ local mingwcc=${CROSSCC:-$(usex x86 i686 x86_64)-w64-mingw32-gcc} |
| 168 |
+ : "${CROSSCFLAGS:=$(CC=${mingwcc} test-flags-CC ${CFLAGS:--O2})}" |
| 169 |
+ : "${CROSSLDFLAGS:=$(CC=${mingwcc} test-flags-CCLD ${LDFLAGS})}" |
| 170 |
+ export CROSS{C,LD}FLAGS |
| 171 |
fi |
| 172 |
|
| 173 |
multilib-minimal_src_configure |
Archives