[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit:     ab3d4382f0e16ddde08f8e3567d74011931bac7e
Author:     Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Tue Dec  1 14:44:42 2020 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 14:49:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=ab3d4382

app-emulation/wine-staging: Pass CFLAGS to mingw

This requires setting CROSSCFLAGS

Signed-off-by: Mike Lothian <mike <AT> fireburn.co.uk>
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 .../{wine-staging-9999.ebuild => wine-staging-5.22-r2.ebuild}     | 8 ++++++--
 app-emulation/wine-staging/wine-staging-9999.ebuild               | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
similarity index 99%
copy from app-emulation/wine-staging/wine-staging-9999.ebuild
copy to app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
index df834fe..9d69e49 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
@@ -448,6 +448,9 @@ src_configure() {
 
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
 
 	multilib-minimal_src_configure
 }
@@ -521,9 +524,10 @@ multilib_src_configure() {
 		$(use_with vaapi va)
 	)
 
-	local PKG_CONFIG
+	local PKG_CONFIG AR RANLIB
 	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
 
 	if use amd64; then
 		if [[ ${ABI} == amd64 ]]; then

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index df834fe..89c3827 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -448,6 +448,9 @@ src_configure() {
 
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
 
 	multilib-minimal_src_configure
 }