From 68c45e0ff176c2f48dfd8d9add4cfbf87b0ef4c9 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Thu, 5 Dec 2024 16:38:00 +0000 Subject: [PATCH 1/3] llvm-19: update to 19.1.4 --- build/llvm/build-19.sh | 2 +- doc/packages.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/llvm/build-19.sh b/build/llvm/build-19.sh index cb46922ce..7bd2b0f9f 100755 --- a/build/llvm/build-19.sh +++ b/build/llvm/build-19.sh @@ -18,7 +18,7 @@ PROG=llvm PKG=ooce/developer/llvm-19 -VER=19.1.3 +VER=19.1.4 SUMMARY="Low Level Virtual Machine compiler infrastructure" DESC="A collection of modular and reusable compiler and toolchain technologies" diff --git a/doc/packages.md b/doc/packages.md index aa005b6f1..f356ec57b 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -75,7 +75,7 @@ | ooce/developer/llvm-16 | 16.0.6 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/llvm-17 | 17.0.6 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/llvm-18 | 18.1.8 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) -| ooce/developer/llvm-19 | 19.1.3 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) +| ooce/developer/llvm-19 | 19.1.4 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/ninja | 1.12.1 | https://github.com/ninja-build/ninja/releases https://ninja-build.org/ | [omniosorg](https://github.com/omniosorg) | ooce/developer/omni | github-latest | https://github.com/omniosorg/omni/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/pkgmgr | github-latest | https://github.com/omniosorg/pkgmgr/releases | [omniosorg](https://github.com/omniosorg) From 7c24bbeece52a2f294ac4f3fd9de0f0ff5365542 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Thu, 5 Dec 2024 16:38:21 +0000 Subject: [PATCH 2/3] clang-19: update to 19.1.4 --- build/clang/build-19.sh | 2 +- doc/packages.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/clang/build-19.sh b/build/clang/build-19.sh index efd158015..3ef8426bd 100755 --- a/build/clang/build-19.sh +++ b/build/clang/build-19.sh @@ -18,7 +18,7 @@ PROG=clang PKG=ooce/developer/clang-19 -VER=19.1.3 +VER=19.1.4 SUMMARY="C language family frontend for LLVM" DESC="The Clang project provides a language front-end and tooling " DESC+="infrastructure for languages in the C language family (C, C++, " diff --git a/doc/packages.md b/doc/packages.md index f356ec57b..8f94220e7 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -59,7 +59,7 @@ | ooce/developer/clang-16 | 16.0.6 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/clang-17 | 17.0.6 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/clang-18 | 18.1.8 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) -| ooce/developer/clang-19 | 19.1.3 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) +| ooce/developer/clang-19 | 19.1.4 | https://github.com/llvm/llvm-project/releases | [omniosorg](https://github.com/omniosorg) | ooce/developer/cmake | 3.30.5 | https://cmake.org/download/ | [omniosorg](https://github.com/omniosorg) | ooce/developer/cscope | 15.9 | https://sourceforge.net/projects/cscope/files/cscope/ | [omniosorg](https://github.com/omniosorg) | ooce/developer/cunit | 2.1-3 | https://sourceforge.net/projects/cunit/files/CUnit/ | [omniosorg](https://github.com/omniosorg) From c98efb9bb9ecfb79916a5c8550d1fa9c00f9cd7b Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Thu, 5 Dec 2024 16:41:27 +0000 Subject: [PATCH 3/3] switch to clang 19 by default for r151053 --- build/meta/extra-build-tools.p5m | 4 ++++ lib/config.sh | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build/meta/extra-build-tools.p5m b/build/meta/extra-build-tools.p5m index 17a0ce35a..10951411d 100644 --- a/build/meta/extra-build-tools.p5m +++ b/build/meta/extra-build-tools.p5m @@ -126,3 +126,7 @@ depend fmri=ooce/developer/clang-18 type=conditional \ depend fmri=ooce/developer/llvm-19 type=conditional \ predicate=release/name@0.5.11-151051 +# clang 19 is the default clang compiler from r151053 onwards +depend fmri=ooce/developer/clang-19 type=conditional \ + predicate=release/name@0.5.11-151053 + diff --git a/lib/config.sh b/lib/config.sh index 267b1e9de..954bb9e23 100644 --- a/lib/config.sh +++ b/lib/config.sh @@ -373,7 +373,8 @@ case $RELVER in 15104[5-6]) DEFAULT_CLANG_VER=15 ;; 15104[7-8]) DEFAULT_CLANG_VER=16 ;; 151049|151050) DEFAULT_CLANG_VER=17 ;; - 15105[1-9]) DEFAULT_CLANG_VER=18 ;; + 15105[1-2]) DEFAULT_CLANG_VER=18 ;; + 15105[3-9]) DEFAULT_CLANG_VER=19 ;; *) DEFAULT_CLANG_VER=13 ;; esac