public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
Date: Fri, 26 May 2023 14:30:44 +0000 (UTC)	[thread overview]
Message-ID: <1685111437.af1392f6912caa84e8d47a1b5b4814dd95946f82.grobian@gentoo> (raw)

commit:     af1392f6912caa84e8d47a1b5b4814dd95946f82
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:29:59 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:30:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=af1392f6

scripts/auto-bootstraps/dobootstrap: detect musl

this doesn't make a bootstrap work on musl-based systems

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/auto-bootstraps/dobootstrap | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index b4042a66e0..b2495c4d7d 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -133,7 +133,7 @@ do_prepare() {
 		echo $((endtime - starttime)) > elapsedtime
 
 		# massage CHOST on Linux systems
-		if [[ ${chost} == *-linux-gnu* ]] ; then
+		if [[ ${chost} == *-linux-* ]] ; then
 			# two choices here: x86_64_ubuntu16-linux-gnu
 			#                   x86_64-pc-linux-ubuntu16
 			# I choose the latter because it is compatible with most
@@ -148,7 +148,10 @@ do_prepare() {
 
 				# Gentoo's versioning isn't really relevant, since it is
 				# a rolling distro
-				[[ ${dist,,} == "gentoo" ]] && rel=
+				if [[ ${dist,,} == "gentoo" ]] ; then
+					rel=
+					[[ ${chost##*-} == "musl" ]] && rel="musl"
+				fi
 			fi
 			[[ -z ${dist} ]] && dist=linux
 			# leave rel unset/empty if we don't know about it


             reply	other threads:[~2023-05-26 14:30 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-26 14:30 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-16  7:47 [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/ Fabian Groffen
2024-04-05 15:09 Fabian Groffen
2024-04-05 11:45 Fabian Groffen
2024-04-02 17:31 Fabian Groffen
2024-03-30 12:13 Fabian Groffen
2024-03-28 16:12 Fabian Groffen
2024-03-02 12:57 Fabian Groffen
2024-02-24  9:10 Fabian Groffen
2024-02-05 11:54 Fabian Groffen
2024-01-29 18:59 Fabian Groffen
2024-01-15 10:37 Fabian Groffen
2024-01-14 10:48 Fabian Groffen
2024-01-14 10:46 Fabian Groffen
2024-01-14 10:46 Fabian Groffen
2023-08-31  6:36 Fabian Groffen
2023-06-20  9:08 Fabian Groffen
2023-06-20  8:34 Fabian Groffen
2023-05-31  9:19 Fabian Groffen
2023-05-30  6:01 Fabian Groffen
2023-05-26 14:33 Fabian Groffen
2022-05-31 11:10 Fabian Groffen
2022-05-31  9:16 Fabian Groffen
2021-12-30 12:25 Fabian Groffen
2021-12-07  8:35 Fabian Groffen
2021-02-20 14:19 Fabian Groffen
2021-02-05 17:48 Fabian Groffen
2021-01-17 18:42 Fabian Groffen
2021-01-10 10:53 Fabian Groffen
2021-01-05 19:09 Fabian Groffen
2021-01-05 19:09 Fabian Groffen
2020-12-09 15:19 Fabian Groffen
2020-12-09 12:20 Fabian Groffen
2020-12-08  7:26 Fabian Groffen
2020-11-28 10:03 Fabian Groffen
2020-11-28 10:02 Fabian Groffen
2020-11-27 10:58 Fabian Groffen
2020-11-27 10:58 Fabian Groffen
2020-11-24  9:27 Fabian Groffen
2020-06-07 12:12 Fabian Groffen
2020-06-01  8:56 Fabian Groffen
2020-06-01  8:37 Fabian Groffen
2020-06-01  7:47 Fabian Groffen
2019-07-14  9:07 Fabian Groffen
2019-07-02  9:37 Fabian Groffen
2019-07-02  9:37 Fabian Groffen
2019-07-02  9:04 Fabian Groffen
2019-06-21 19:01 Fabian Groffen
2019-06-18 10:42 Fabian Groffen
2019-06-16 18:44 Fabian Groffen
2019-06-14  9:30 Fabian Groffen
2019-06-14  7:50 Fabian Groffen
2019-06-13 19:21 Fabian Groffen
2019-06-06 18:56 Fabian Groffen
2019-05-22 20:12 Fabian Groffen
2019-05-22 17:33 Fabian Groffen
2019-03-22 14:13 Fabian Groffen
2019-03-14  8:15 Fabian Groffen
2019-03-06 11:24 Fabian Groffen
2019-03-06 11:18 Fabian Groffen
2019-03-06 11:09 Fabian Groffen
2019-03-06 11:09 Fabian Groffen
2019-03-06 11:09 Fabian Groffen
2019-02-21 16:36 Fabian Groffen
2019-02-21 16:31 Fabian Groffen
2019-02-21 11:38 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1685111437.af1392f6912caa84e8d47a1b5b4814dd95946f82.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox