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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09E02138239 for ; Sun, 29 Mar 2020 17:45:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24396E0991; Sun, 29 Mar 2020 17:45:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 105D8E098E for ; Sun, 29 Mar 2020 17:45:28 +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 90F0234F6FD for ; Sun, 29 Mar 2020 17:45:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03DB51A9 for ; Sun, 29 Mar 2020 17:45:24 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1585503879.772775deadb874bde912cfaa7e1252f40631f741.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/ X-VCS-Repository: repo/gentoo X-VCS-Files: scripts/bootstrap.sh X-VCS-Directories: scripts/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 772775deadb874bde912cfaa7e1252f40631f741 X-VCS-Branch: master Date: Sun, 29 Mar 2020 17:45:24 +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: 08e18138-9b89-4584-b82a-15bd3f1cb79c X-Archives-Hash: f16d04163200e819d6c882ee7e88231a commit: 772775deadb874bde912cfaa7e1252f40631f741 Author: Matt Turner gentoo org> AuthorDate: Sun Mar 29 17:26:26 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 29 17:44:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772775de scripts/bootstrap.sh: Remove nptlonly cruft Signed-off-by: Matt Turner gentoo.org> scripts/bootstrap.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0a4bc06c3c8..aa31fb15e8b 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -239,9 +239,6 @@ for opt in ${ORIGUSE} ; do fi USE_NPTL=1 ;; - nptlonly) - USE_NPTLONLY=1 - ;; multilib) ALLOWED_USE="${ALLOWED_USE} multilib" ;; @@ -284,13 +281,10 @@ for atom in portage.settings.packages: # Do we really want gettext/nls? [[ ${USE_NLS} != 1 ]] && myGETTEXT= -# Do we really have no 2.4.x nptl kernels in portage? if [[ ${USE_NPTL} = "1" ]] ; then myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')" [[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}" ALLOWED_USE="${ALLOWED_USE} nptl" - # Should we build with nptl only? - [[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly" fi [[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"