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 F0E2F15800A for ; Sat, 19 Aug 2023 15:05:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5801C2BC016; Sat, 19 Aug 2023 15:05:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3F9762BC016 for ; Sat, 19 Aug 2023 15:05: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E2FE335D2B for ; Sat, 19 Aug 2023 15:05:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05698B8B for ; Sat, 19 Aug 2023 15:05:23 +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: <1692457519.87d0a7447f1464157f18a8ba0991719777003325.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/doebuild.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 87d0a7447f1464157f18a8ba0991719777003325 X-VCS-Branch: master Date: Sat, 19 Aug 2023 15:05:23 +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: 5224460f-96e7-4fea-a8e2-83bef84b69bf X-Archives-Hash: 751550abbac6947acecfe523a6873c43 commit: 87d0a7447f1464157f18a8ba0991719777003325 Author: Oskari Pirhonen gmail com> AuthorDate: Sun Aug 13 03:11:15 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 19 15:05:19 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=87d0a744 doebuild: gate -Oline behind MAKEFLAGS check Add a check to see if MAKEFLAGS is set (alongside the existing MAKEOPTS and GNUMAKEFLAGS checks) before enabling output synchronization. This is only tangentially related to the bug below via being a (likely rare) case of MAKEFLAGS being set in the wild. Bug: https://bugs.gentoo.org/909009 Signed-off-by: Oskari Pirhonen gmail.com> Signed-off-by: Sam James gentoo.org> lib/portage/package/ebuild/doebuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 8b65a7862f..4d4e674c4b 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -589,7 +589,7 @@ def doebuild_environment( nproc = get_cpu_count() if nproc: mysettings["MAKEOPTS"] = "-j%d" % (nproc) - if "GNUMAKEFLAGS" not in mysettings: + if "GNUMAKEFLAGS" not in mysettings and "MAKEFLAGS" not in mysettings: mysettings["GNUMAKEFLAGS"] = "--output-sync=line" if not eapi_exports_KV(eapi):