| 1 |
commit: 998666036e59200210d442094bbfceb07b7b8c8b |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 12 08:46:50 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 12 18:09:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99866603 |
| 7 |
|
| 8 |
app-emulation/wine-staging: backport AR RANLIB handling from wine-vanilla |
| 9 |
|
| 10 |
Before the change binutils-config[-native-symlinks] build failed |
| 11 |
in attempt to use unprefixed `ar`. The fix is present in wine-vanilla |
| 12 |
for a while. |
| 13 |
|
| 14 |
This change backports it to wine-staging. |
| 15 |
|
| 16 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 17 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/21609 |
| 19 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 20 |
|
| 21 |
app-emulation/wine-staging/wine-staging-6.12.ebuild | 5 ++--- |
| 22 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 5 ++--- |
| 23 |
2 files changed, 4 insertions(+), 6 deletions(-) |
| 24 |
|
| 25 |
diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild |
| 26 |
index 9f66da3e67f..77c35e15d93 100644 |
| 27 |
--- a/app-emulation/wine-staging/wine-staging-6.12.ebuild |
| 28 |
+++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild |
| 29 |
@@ -528,10 +528,9 @@ multilib_src_configure() { |
| 30 |
$(use_with vaapi va) |
| 31 |
) |
| 32 |
|
| 33 |
- local PKG_CONFIG AR RANLIB |
| 34 |
+ local PKG_CONFIG |
| 35 |
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 |
| 36 |
- # set AR and RANLIB to make QA scripts happy; #483342 |
| 37 |
- tc-export PKG_CONFIG AR RANLIB |
| 38 |
+ tc-export PKG_CONFIG |
| 39 |
|
| 40 |
if use amd64; then |
| 41 |
if [[ ${ABI} == amd64 ]]; then |
| 42 |
|
| 43 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 44 |
index 5fa92704696..97f1f417626 100644 |
| 45 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 46 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 47 |
@@ -528,10 +528,9 @@ multilib_src_configure() { |
| 48 |
$(use_with vaapi va) |
| 49 |
) |
| 50 |
|
| 51 |
- local PKG_CONFIG AR RANLIB |
| 52 |
+ local PKG_CONFIG |
| 53 |
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 |
| 54 |
- # set AR and RANLIB to make QA scripts happy; #483342 |
| 55 |
- tc-export PKG_CONFIG AR RANLIB |
| 56 |
+ tc-export PKG_CONFIG |
| 57 |
|
| 58 |
if use amd64; then |
| 59 |
if [[ ${ABI} == amd64 ]]; then |
Archives