Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/
Date: Sun, 29 Mar 2020 17:45:29
Message-Id: 1585503879.772775deadb874bde912cfaa7e1252f40631f741.mattst88@gentoo
1 commit: 772775deadb874bde912cfaa7e1252f40631f741
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 29 17:26:26 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 29 17:44:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772775de
7
8 scripts/bootstrap.sh: Remove nptlonly cruft
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 scripts/bootstrap.sh | 6 ------
13 1 file changed, 6 deletions(-)
14
15 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
16 index 0a4bc06c3c8..aa31fb15e8b 100755
17 --- a/scripts/bootstrap.sh
18 +++ b/scripts/bootstrap.sh
19 @@ -239,9 +239,6 @@ for opt in ${ORIGUSE} ; do
20 fi
21 USE_NPTL=1
22 ;;
23 - nptlonly)
24 - USE_NPTLONLY=1
25 - ;;
26 multilib)
27 ALLOWED_USE="${ALLOWED_USE} multilib"
28 ;;
29 @@ -284,13 +281,10 @@ for atom in portage.settings.packages:
30 # Do we really want gettext/nls?
31 [[ ${USE_NLS} != 1 ]] && myGETTEXT=
32
33 -# Do we really have no 2.4.x nptl kernels in portage?
34 if [[ ${USE_NPTL} = "1" ]] ; then
35 myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')"
36 [[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}"
37 ALLOWED_USE="${ALLOWED_USE} nptl"
38 - # Should we build with nptl only?
39 - [[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly"
40 fi
41 [[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"