Autotools rework #210
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| From 3795bc9b268c3c3025074a3511f8454066fe2ca6 Mon Sep 17 00:00:00 2001 | ||
| From: Dennis Bonke <[email protected]> | ||
| Date: Mon, 3 Oct 2022 22:30:43 +0200 | ||
| Subject: [PATCH] Add Managarm support | ||
|
|
||
| Signed-off-by: Dennis Bonke <[email protected]> | ||
| --- | ||
| lib/config.guess | 6 ++++++ | ||
| lib/config.sub | 26 +++++++++++++++++++++++--- | ||
| 2 files changed, 29 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/lib/config.guess b/lib/config.guess | ||
| index e81d3ae..9cafc6a 100755 | ||
| --- a/lib/config.guess | ||
| +++ b/lib/config.guess | ||
| @@ -963,6 +963,12 @@ EOF | ||
| GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` | ||
| GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC | ||
| ;; | ||
| + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) | ||
| + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" | ||
| + ;; | ||
| + *:[Mm]anagarm:*:*) | ||
| + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" | ||
| + ;; | ||
| *:Minix:*:*) | ||
| GUESS=$UNAME_MACHINE-unknown-minix | ||
| ;; | ||
| diff --git a/lib/config.sub b/lib/config.sub | ||
| index d74fb6d..ef0004f 100755 | ||
| --- a/lib/config.sub | ||
| +++ b/lib/config.sub | ||
| @@ -145,7 +145,7 @@ case $1 in | ||
| nto-qnx* | linux-* | uclinux-uclibc* \ | ||
| | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | ||
| | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | ||
| - | storm-chaos* | os2-emx* | rtmk-nova*) | ||
| + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) | ||
| basic_machine=$field1 | ||
| basic_os=$maybe_os | ||
| ;; | ||
| @@ -1336,6 +1336,10 @@ EOF | ||
| kernel=linux | ||
| os=`echo "$basic_os" | sed -e 's|linux|gnu|'` | ||
| ;; | ||
| + managarm*) | ||
| + kernel=managarm | ||
| + os=$(echo $basic_os | sed -e 's|managarm|mlibc|') | ||
| + ;; | ||
| *) | ||
| kernel= | ||
| os=$basic_os | ||
| @@ -1748,7 +1752,8 @@ case $os in | ||
| | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | ||
| | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | ||
| | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | ||
| - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) | ||
| + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ | ||
| + | mlibc* ) | ||
| ;; | ||
| # This one is extra strict with allowed versions | ||
| sco3.2v2 | sco3.2v[4-9]* | sco5v6*) | ||
| @@ -1756,6 +1761,9 @@ case $os in | ||
| ;; | ||
| none) | ||
| ;; | ||
| + kernel* ) | ||
| + # Restricted further below | ||
| + ;; | ||
| *) | ||
| echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 | ||
| exit 1 | ||
| @@ -1770,12 +1778,24 @@ case $kernel-$os in | ||
| ;; | ||
| uclinux-uclibc* ) | ||
| ;; | ||
| - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) | ||
| + managarm-mlibc* ) | ||
| + ;; | ||
| + managarm-kernel* ) | ||
| + ;; | ||
| + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) | ||
| # These are just libc implementations, not actual OSes, and thus | ||
| # require a kernel. | ||
| echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 | ||
| exit 1 | ||
| ;; | ||
| + -kernel* ) | ||
| + echo "Invalid configuration \`$1': -kernel must not appear on its own." 1>&2 | ||
| + exit 1 | ||
| + ;; | ||
| + *-kernel* ) | ||
| + echo "Invalid configuration \`$1': Kernel \`$kernel' does not support -kernel." 1>&2 | ||
| + exit 1 | ||
| + ;; | ||
| kfreebsd*-gnu* | kopensolaris*-gnu*) | ||
| ;; | ||
| vxworks-simlinux | vxworks-simwindows | vxworks-spe) | ||
| -- | ||
| 2.37.2 | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this done?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to mint, this is the better way of doing it. I tried not doing it in all directories but that will give libtool version mismatches. See also this comment thread.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is another reason to invoke the right version of the right tool, and that alone, for regenerating gcc files (remember, we aren't dealing with a normal autotools build system, but a broken one)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah not gonna carry libtool 2.2.7, gcc can suck it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
didn't say that you should, neither autoconf and automake install libtool, this is only a problem if you don't use those (on top of the other problems that using wrong versions will cause)
EDIT: also, regardless, gcc (mostly, iirc libgo is the only exception, which doesn't matter here) uses a single libtool in the source of the repo, selected later by other build scripts explicitly, so getting version mismatches in other directories is definitely something going wrong