From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB2CC13835B for ; Tue, 1 Dec 2020 14:55:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1F0AE084E; Tue, 1 Dec 2020 14:55:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6E8AE084A for ; Tue, 1 Dec 2020 14:55:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47504340CDF for ; Tue, 1 Dec 2020 14:55:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB032474 for ; Tue, 1 Dec 2020 14:55:10 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1606834501.c7b78182db1a8c4d669629d8135f9d244015cd0c.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/wine-staging-5.22-r2.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: c7b78182db1a8c4d669629d8135f9d244015cd0c X-VCS-Branch: master Date: Tue, 1 Dec 2020 14:55:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ad093817-b85e-44d0-9141-68e17e8c5cd2 X-Archives-Hash: ebbbce826421935cec0027d9eeb127ce commit: c7b78182db1a8c4d669629d8135f9d244015cd0c Author: Nick Sarnie gentoo org> AuthorDate: Tue Dec 1 14:54:25 2020 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Tue Dec 1 14:55:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7b78182 app-emulation/wine-staging: Sync with ::wine Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Nick Sarnie 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 df834fec4d8..9d69e49cd8d 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 df834fec4d8..89c38276706 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 }