From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-862986-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 4999F59CA2
for <garchives@archives.gentoo.org>; Sat, 13 Feb 2016 09:55:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BB4A8E07D4;
Sat, 13 Feb 2016 09:55:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 614BAE07D4
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 09:55:55 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 696F9340845
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 09:55:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DE28150
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Feb 2016 09:55:52 +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: <1455357343.fdabbac2e9d9d4b6cda129c3640f192da35868e5.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: fdabbac2e9d9d4b6cda129c3640f192da35868e5
X-VCS-Branch: master
Date: Sat, 13 Feb 2016 09:55:52 +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-Archives-Salt: 601add66-5a6f-46d7-b9e3-1d1d0d1e9c24
X-Archives-Hash: cd570ad5fde27e7aefd7fec9449a7ac9
commit: fdabbac2e9d9d4b6cda129c3640f192da35868e5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 09:55:43 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 09:55:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fdabbac2
scripts/bootstrap-prefix: try to hide java dialog on OSX
scripts/bootstrap-prefix.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d6b53f1..e1e75fb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -981,6 +981,19 @@ bootstrap_stage1() { (
} > "${ROOT}"/tmp/usr/bin/nm
chmod 755 "${ROOT}"/tmp/usr/bin/nm
;;
+ *-darwin*)
+ # Recent Mac OS X have a nice popup to install java when
+ # it's called without being installed, this doesn't stop the
+ # process from going, but keeps popping up a dialog during
+ # the bootstrap process, which is slightly anoying.
+ # Nevertheless, we don't want Java when it's installed to be
+ # detected, so hide during the stage builds
+ {
+ echo "#!$(type -P false)"
+ } > "${ROOT}"/tmp/usr/bin/java
+ cp "${ROOT}"/tmp/usr/bin/java{,c}
+ chmod 755 "${ROOT}"/tmp/usr/bin/java{,c}
+ ;;
esac
# important to have our own (non-flawed one) since Python (from
# Portage) and binutils use it