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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1411215800A for ; Thu, 10 Aug 2023 19:28:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4021D2BC021; Thu, 10 Aug 2023 19:28:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24CB12BC021 for ; Thu, 10 Aug 2023 19:28:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2E4233BEA5 for ; Thu, 10 Aug 2023 19:28:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A571F35 for ; Thu, 10 Aug 2023 19:28:22 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1691695671.c3dbb1d1feb598b2f35caae200a202389d6bee4a.ionen@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-8.13.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c3dbb1d1feb598b2f35caae200a202389d6bee4a X-VCS-Branch: master Date: Thu, 10 Aug 2023 19:28:22 +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: e8df3cd1-5d9b-4e9c-aeb6-56e9f9d0d176 X-Archives-Hash: 04eba7e2ca4c6844283c1604808b4119 commit: c3dbb1d1feb598b2f35caae200a202389d6bee4a Author: Ionen Wolkens gentoo org> AuthorDate: Thu Aug 10 19:17:04 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Aug 10 19:27:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3dbb1d1 app-emulation/wine-staging: respect CROSS*FLAGS again Oops, overlooked while changing this around -- albeit likely scarcely used when it otherwise use CFLAGS anyway. Now with more syntax highlighting confusion for vim. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-staging/wine-staging-8.13.ebuild | 8 ++++---- app-emulation/wine-staging/wine-staging-9999.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild b/app-emulation/wine-staging/wine-staging-8.13.ebuild index 3a7cda74ca11..d27aaaf1b5d2 100644 --- a/app-emulation/wine-staging/wine-staging-8.13.ebuild +++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild @@ -311,7 +311,7 @@ src_configure() { ac_cv_prog_x86_64_CC="${mingwcc_amd64}" ac_cv_prog_i386_CC="${mingwcc_x86}" - CROSSCFLAGS="$( + CROSSCFLAGS="${CROSSCFLAGS:-$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 @@ -322,13 +322,13 @@ src_configure() { use custom-cflags || append-cflags -mno-avx CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} - )" + )}" - CROSSLDFLAGS="$( + CROSSLDFLAGS="${CROSSLDFLAGS:-$( filter-flags '-fuse-ld=*' CC=${mingwcc} test-flags-CCLD ${LDFLAGS} - )" + )}" ) fi diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 3a7cda74ca11..d27aaaf1b5d2 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -311,7 +311,7 @@ src_configure() { ac_cv_prog_x86_64_CC="${mingwcc_amd64}" ac_cv_prog_i386_CC="${mingwcc_x86}" - CROSSCFLAGS="$( + CROSSCFLAGS="${CROSSCFLAGS:-$( filter-flags '-fstack-protector*' #870136 filter-flags '-mfunction-return=thunk*' #878849 @@ -322,13 +322,13 @@ src_configure() { use custom-cflags || append-cflags -mno-avx CC=${mingwcc} test-flags-CC ${CFLAGS:--O2} - )" + )}" - CROSSLDFLAGS="$( + CROSSLDFLAGS="${CROSSLDFLAGS:-$( filter-flags '-fuse-ld=*' CC=${mingwcc} test-flags-CCLD ${LDFLAGS} - )" + )}" ) fi