From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 22B0C138263 for ; Mon, 23 May 2016 13:13:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 776C014278; Mon, 23 May 2016 13:13:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFFFF14278 for ; Mon, 23 May 2016 13:13:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9400E340C79 for ; Mon, 23 May 2016 13:13:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9188ACFE for ; Mon, 23 May 2016 13:13:05 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1463743541.cae7024e8a2282ddefc150fab1e274a476e41180.haubi@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: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: cae7024e8a2282ddefc150fab1e274a476e41180 X-VCS-Branch: master Date: Mon, 23 May 2016 13:13:05 +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-Archives-Salt: b632182c-1100-4881-b2b6-680e61f30966 X-Archives-Hash: a6b6bedda3503436379ced2a1d18735a commit: cae7024e8a2282ddefc150fab1e274a476e41180 Author: Michael Haubenwallner ssi-schaefer com> AuthorDate: Fri May 20 11:25:41 2016 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Fri May 20 11:25:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cae7024e bootstrap-prefix.sh: drop cygwin profile versioning; check minimum cygwin version scripts/bootstrap-prefix.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 74863d4..0ba0d5a 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -317,10 +317,10 @@ bootstrap_setup() { profile="prefix/windows/winnt/${CHOST#i586-pc-winnt}/x86" ;; i686-pc-cygwin*) - profile="prefix/windows/cygwin/${CHOST#i686-pc-cygwin}/x86" + profile="prefix/windows/cygwin/x86" ;; x86_64-pc-cygwin*) - profile="prefix/windows/cygwin/${CHOST#x86_64-pc-cygwin}/x64" + profile="prefix/windows/cygwin/x64" ;; hppa64*-hp-hpux11*) profile="prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa64" @@ -2213,12 +2213,9 @@ if [[ -z ${CHOST} ]]; then ;; CYGWIN*) case `uname -r` in - 1.7*) # http://www.cygwin.com/ml/cygwin/2009-02/msg00669.html - CHOST="`uname -m`-pc-cygwin1.7" - ;; - 2.[0-9]*) # https://sourceware.org/ml/cygwin/2015-04/msg00595.html - # probably split on important features - CHOST="`uname -m`-pc-cygwin2.0" + [0-1].*|2.[0-4].*|2.5.[0-1]|2.5.[0-1]'('*) + eerror "Can't deal with Cygwin before 2.5.2 or so, sorry!" + exit 1 ;; *) CHOST="`uname -m`-pc-cygwin"