Skip to content

Commit

Permalink
Merge pull request #1552 from hadfl/llvm
Browse files Browse the repository at this point in the history
llvm/clang 19 package updates
  • Loading branch information
oetiker authored Dec 6, 2024
2 parents 300df84 + c98efb9 commit 092cd99
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build/clang/build-19.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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++, "
Expand Down
2 changes: 1 addition & 1 deletion build/llvm/build-19.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 4 additions & 0 deletions build/meta/extra-build-tools.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,7 @@ depend fmri=ooce/developer/clang-18 type=conditional \
depend fmri=ooce/developer/llvm-19 type=conditional \
predicate=release/[email protected]

# clang 19 is the default clang compiler from r151053 onwards
depend fmri=ooce/developer/clang-19 type=conditional \
predicate=release/[email protected]

4 changes: 2 additions & 2 deletions doc/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion lib/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 092cd99

Please sign in to comment.