From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1237220-garchives=archives.gentoo.org@lists.gentoo.org>
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 6B9751382C5
	for <garchives@archives.gentoo.org>; Sun,  3 Jan 2021 14:37:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9A240E086E;
	Sun,  3 Jan 2021 14:37:58 +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 7FDECE086E
	for <gentoo-commits@lists.gentoo.org>; Sun,  3 Jan 2021 14:37:58 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 83A3C341047
	for <gentoo-commits@lists.gentoo.org>; Sun,  3 Jan 2021 14:37:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 26AF2CC
	for <gentoo-commits@lists.gentoo.org>; Sun,  3 Jan 2021 14:37:56 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1609684626.26dca920b3f483627ddfff332aff7d4c5b47f6fd.grobian@gentoo>
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
X-VCS-Repository: repo/proj/prefix
X-VCS-Files: scripts/bootstrap-prefix.sh
X-VCS-Directories: scripts/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 26dca920b3f483627ddfff332aff7d4c5b47f6fd
X-VCS-Branch: master
Date: Sun,  3 Jan 2021 14:37:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6927e79d-4ab1-4b14-8f87-2b43f9c0dae9
X-Archives-Hash: 74b90a6274644120f2dd6438b5d7284b

commit:     26dca920b3f483627ddfff332aff7d4c5b47f6fd
Author:     Jacob Floyd <cognifloyd <AT> gmail <DOT> com>
AuthorDate: Fri Dec  4 02:37:47 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 14:37:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=26dca920

scripts/bootstrap-prefix: Fix Python for stage3 on Darwin

Patch stage1 bootstrapped python to disable _scproxy module (which is
what the ebuild does), to avoid a backtrace when it tries to use the
network.

Bug: https://bugs.gentoo.org/758167

Signed-off-by: Jacob Floyd <cognifloyd <AT> gmail.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 408ecb06c9..0dda8055df 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1012,6 +1012,14 @@ bootstrap_python() {
 		;;
 	esac
 
+	case ${CHOST} in
+	(*-darwin*)
+		# avoid triggering compiled out system proxy retrieval code (_scproxy)
+		sed -i -e '/sys.platform/s/darwin/disabled-darwin/' \
+			Lib/urllib/request.py
+		;;
+	esac
+
 	fix_config_sub
 
 	local myconf=""