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 D5ED7158086 for ; Wed, 17 Nov 2021 11:48:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D124E07EE; Wed, 17 Nov 2021 11:48:53 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC716E07EE for ; Wed, 17 Nov 2021 11:48:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1E67342BE5 for ; Wed, 17 Nov 2021 11:48:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58C99143 for ; Wed, 17 Nov 2021 11:48:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637149719.93ac8864bfa76c8376f0aaaf0c1c00023fd5eb50.sam@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: eclass/ X-VCS-Repository: proj/musl X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 93ac8864bfa76c8376f0aaaf0c1c00023fd5eb50 X-VCS-Branch: master Date: Wed, 17 Nov 2021 11:48:48 +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: 64626c7e-723e-4948-abcb-d86f837971c5 X-Archives-Hash: 95af728832734670865d8fcb3295c658 commit: 93ac8864bfa76c8376f0aaaf0c1c00023fd5eb50 Author: Sam James gentoo org> AuthorDate: Wed Nov 17 11:48:39 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 17 11:48:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=93ac8864 toolchain.eclass: only apply patches if CTARGET is musl Signed-off-by: Sam James gentoo.org> eclass/toolchain.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 39466996..627531f2 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -556,7 +556,7 @@ do_gcc_gentoo_patches() { tc_apply_patches "Applying uClibc patches ..." "${WORKDIR}"/uclibc/*.patch fi - if [[ -n ${MUSL_VER} ]] ; then #&& [[ ${CTARGET} == *musl* ]] ; then + if [[ -n ${MUSL_VER} ]] && [[ ${CTARGET} == *musl* ]] ; then if [[ ${CATEGORY} == cross-* ]] ; then # We don't want to apply some patches when cross-compiling. if [[ -d "${WORKDIR}"/musl/nocross ]] ; then