Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toolchain upgrades! #428

Merged
merged 9 commits into from
Dec 31, 2024
Merged
17 changes: 8 additions & 9 deletions bootstrap.d/dev-libs.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -581,32 +581,31 @@ packages:
categories: ['dev-libs']
source:
subdir: 'ports'
hg: 'https://gmplib.org/repo/gmp-6.2/'
tag: 'tip'
version: '6.2.1'
url: 'https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz'
format: 'tar.xz'
checksum: 'blake2b:a865129e2b3f634ec5bad7f97ed89532e43f5662ac47a7d8ab7f0df8c9f8d0886bd984651422e2573c2163bca69c0547c248147ec90880accbd53db97dc0ddee'
extract_path: 'gmp-6.3.0'
version: '6.3.0'
avdgrinten marked this conversation as resolved.
Show resolved Hide resolved
tools_required:
- host-autoconf-v2.69
- host-automake-v1.15
- host-libtool
regenerate:
- args: ['@THIS_SOURCE_DIR@/.bootstrap']
- args: ['autoreconf', '-fvi']
- args: ['cp', '@THIS_SOURCE_DIR@/configfsf.guess', '@THIS_SOURCE_DIR@/config.guess']
- args: ['cp',
'@BUILD_ROOT@/tools/host-automake-v1.15/share/automake-1.15/config.sub',
'@THIS_SOURCE_DIR@/']
tools_required:
- system-gcc
pkgs_required:
- mlibc
revision: 8
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
- '--host=@OPTION:arch-triple@'
- '--prefix=/usr'
- '--enable-cxx'
- '--disable-static'
- '--docdir=/usr/share/doc/gmp-6.2.1'
- '--docdir=/usr/share/doc/gmp-6.3.0'
build:
- args: ['make', '-j@PARALLELISM@']
- args: ['make', 'install']
Expand Down
7 changes: 4 additions & 3 deletions bootstrap.d/managarm-build.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ tools:
labels: [aarch64, riscv64]
architecture: '@OPTION:arch@'
from_source: binutils
revision: 3
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand All @@ -244,6 +244,7 @@ tools:
- '--with-sysroot=@SYSROOT_DIR@'
# On recent compilers, binutils 2.26 causes implicit-fallthrough warnings, among others.
- '--disable-werror'
- '--disable-gdb'
# -g blows up the binary size.
- 'CFLAGS=-O2'
compile:
Expand Down Expand Up @@ -325,7 +326,7 @@ tools:
tools_required:
- tool: cross-binutils
recursive: true
revision: 2
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down Expand Up @@ -383,7 +384,7 @@ tools:
tools_required:
- tool: cross-binutils
recursive: true
revision: 2
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down
2 changes: 2 additions & 0 deletions bootstrap.d/managarm-system.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ packages:
> ./meson-custom.cross-file
- args:
- 'meson'
- 'setup'
- '--cross-file=@SOURCE_ROOT@/scripts/meson-kernel-common.cross-file'
- '--cross-file=./meson-custom.cross-file'
- '--prefix=/usr/managarm'
Expand Down Expand Up @@ -246,6 +247,7 @@ packages:
> ./meson-custom.cross-file
- args:
- 'meson'
- 'setup'
- '--cross-file=./meson-custom.cross-file'
- '--prefix=/usr'
- '--libdir=lib'
Expand Down
4 changes: 2 additions & 2 deletions bootstrap.d/sys-apps.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ packages:
- libxcrypt
- libiconv
- libintl
revision: 3
revision: 4
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down Expand Up @@ -1363,7 +1363,7 @@ packages:
- system-gcc
pkgs_required:
- mlibc
revision: 2
revision: 3
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down
22 changes: 10 additions & 12 deletions bootstrap.d/sys-devel.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@ sources:
- name: binutils
subdir: 'ports'
git: 'https://github.com/managarm/binutils-gdb.git'
tag: 'managarm/binutils-2_40_2'
version: '2.40'
sources_required: ['gnuconfig']
regenerate:
- args: ['cp', '@SOURCE_ROOT@/ports/gnuconfig/config.sub', '@THIS_SOURCE_DIR@/.']
- args: ['cp', '@SOURCE_ROOT@/ports/gnuconfig/config.guess', '@THIS_SOURCE_DIR@/.']
branch: 'managarm/binutils-2_43_1'
commit: 'ec4ab6f1a2188a8d39bc32291d0032722893527e' # No tag made, so take current head of the branch
version: '2.43.1'

- name: llvm
subdir: 'ports'
Expand All @@ -44,8 +41,9 @@ sources:
- name: gcc
subdir: 'ports'
git: 'https://github.com/managarm/gcc.git'
tag: 'managarm/gcc-13.2.3'
version: '13.2.3'
branch: 'managarm/gcc-14'
commit: '76e048f37a3a16ed6346dc6cb1cd1d333e59a42c' # No tag made, so take current head of the branch
version: '14.2.0'
sources_required: ['gnuconfig']
regenerate:
- args: ['cp', '@SOURCE_ROOT@/ports/gnuconfig/config.sub', '@THIS_SOURCE_DIR@/.']
Expand Down Expand Up @@ -407,7 +405,7 @@ packages:
- mpfr
- mpc
- zlib
revision: 3
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down Expand Up @@ -448,7 +446,7 @@ packages:
- tool: system-gcc
pkgs_required:
- mlibc
revision: 5
revision: 1
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand All @@ -461,11 +459,11 @@ packages:
- '--disable-nls'
# On recent compilers, binutils 2.26 causes implicit-fallthrough warnings, among others.
- '--disable-werror'
- '--disable-gdb'
# -g blows up the binary size.
- 'CFLAGS=-O2'
build:
#- args: ['make', '-j@PARALLELISM@', 'all-binutils', 'all-gas', 'all-ld']
- args: ['make', 'all-binutils', 'all-gas', 'all-ld']
- args: ['make', '-j@PARALLELISM@', 'all-binutils', 'all-gas', 'all-ld']
- args: ['make', 'install-binutils', 'install-gas', 'install-ld']
environ:
DESTDIR: '@THIS_COLLECT_DIR@'
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.d/sys-libs.y4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ packages:
- system-gcc
pkgs_required:
- mlibc
revision: 10
revision: 11
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down
109 changes: 0 additions & 109 deletions patches/gcc/624e274ca3a4405a55662fa72d1163120df0e03d.patch

This file was deleted.

28 changes: 21 additions & 7 deletions patches/ncurses/0001-Add-managarm-support.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
From 3c5c2fe0ce67f80ce9698f0c6154cc1d41a113bd Mon Sep 17 00:00:00 2001
From 5da74d1cd962238655b7f9349e031cefb4836a62 Mon Sep 17 00:00:00 2001
From: Dennis Bonke <admin@dennisbonke.com>
Date: Tue, 9 Feb 2021 22:45:04 +0100
Subject: [PATCH] Add managarm support

Signed-off-by: Dennis Bonke <admin@dennisbonke.com>
---
config.sub | 2 +-
configure | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
config.sub | 2 +-
configure | 4 ++++
test/picsmap.c | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/config.sub b/config.sub
index 0f2234c1..69ffcaa9 100755
index 0f2234c..69ffcaa 100755
--- a/config.sub
+++ b/config.sub
@@ -1366,7 +1366,7 @@ case $os in
Expand All @@ -23,7 +24,7 @@ index 0f2234c1..69ffcaa9 100755
;;
qnx*)
diff --git a/configure b/configure
index 06f344f3..72e641d3 100755
index 06f344f..72e641d 100755
--- a/configure
+++ b/configure
@@ -5961,6 +5961,10 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
Expand All @@ -37,6 +38,19 @@ index 06f344f3..72e641d3 100755
(mingw*)
cf_cv_shlib_version=mingw
cf_cv_shlib_version_infix=mingw
diff --git a/test/picsmap.c b/test/picsmap.c
index 432fbf7..849ac7e 100644
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -60,6 +60,8 @@
#define my_intptr_t long
#endif

+#include <strings.h>
+
#if HAVE_TSEARCH
#include <search.h>
#endif
--
2.30.0
2.45.2

Loading
Loading