Add ABI separation on the LLVM recipe

2026-06-22 12:54:20 +08:00 · 2024-06-07 18:55:31 +00:00 · 2024-06-07 18:55:31 +00:00 · 5e66c2fb26
commit 5e66c2fb26
parent 52af1871a7
21 changed files with 19 additions and 19 deletions
--- a/recipes/demos/gears/recipe.sh
+++ b/recipes/demos/gears/recipe.sh
@ -1,4 +1,4 @@
-BUILD_DEPENDS=(liborbital llvm mesa mesa-glu zlib)
+BUILD_DEPENDS=(liborbital llvm18 mesa mesa-glu zlib)

 function recipe_version {
    printf "1.0.0"
--- a/recipes/demos/glium/recipe.sh
+++ b/recipes/demos/glium/recipe.sh
@ -1,6 +1,6 @@
 GIT=https://gitlab.redox-os.org/redox-os/glium.git
 GIT_UPSTREAM=https://github.com/glium/glium.git
-BUILD_DEPENDS=(llvm mesa zlib)
+BUILD_DEPENDS=(llvm18 mesa zlib)
 BRANCH=redox
 CARGOFLAGS="--example teapot"

--- a/recipes/demos/osdemo/recipe.sh
+++ b/recipes/demos/osdemo/recipe.sh
@ -1,4 +1,4 @@
-BUILD_DEPENDS=(liborbital llvm mesa mesa-glu zlib)
+BUILD_DEPENDS=(liborbital llvm18 mesa mesa-glu zlib)

 function recipe_version {
    printf "1.0.0"
--- a/recipes/demos/sdl2-gears/recipe.sh
+++ b/recipes/demos/sdl2-gears/recipe.sh
@ -1,4 +1,4 @@
-BUILD_DEPENDS=(sdl2-image sdl2-mixer sdl2-ttf sdl2 liborbital llvm mesa freetype2 libjpeg libpng libogg libvorbis zlib)
+BUILD_DEPENDS=(sdl2-image sdl2-mixer sdl2-ttf sdl2 liborbital llvm18 mesa freetype2 libjpeg libpng libogg libvorbis zlib)

 function recipe_version {
    printf "1.0.0"
--- a/recipes/dev/llvm18/native.cmake
+++ b/recipes/dev/llvm18/native.cmake
--- a/recipes/dev/llvm18/recipe.toml
+++ b/recipes/dev/llvm18/recipe.toml
--- a/recipes/dev/rust/recipe.sh
+++ b/recipes/dev/rust/recipe.sh
@ -1,6 +1,6 @@
 GIT=https://gitlab.redox-os.org/redox-os/rust.git
 BRANCH=redox-2024-05-11
-BUILD_DEPENDS=(llvm)
+BUILD_DEPENDS=(llvm18)
 DEPENDS="gcc13 cargo"
 PREPARE_COPY=0

--- a/recipes/games/classicube/recipe.toml
+++ b/recipes/games/classicube/recipe.toml
@ -5,7 +5,7 @@ git = "https://github.com/jackpot51/ClassiCube.git"
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm",
+    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/games/hematite/recipe.toml
+++ b/recipes/games/hematite/recipe.toml
@ -6,7 +6,7 @@ upstream = "https://github.com/PistonDevelopers/hematite.git"
 [build]
 template = "custom"
 dependencies = [
-    "llvm",
+    "llvm18",
    "mesa",
    "zlib"
 ]
--- a/recipes/games/neverball/recipe.sh
+++ b/recipes/games/neverball/recipe.sh
@ -1,6 +1,6 @@
 VERSION=1.6.0
 TAR="https://neverball.org/neverball-${VERSION}.tar.gz"
-BUILD_DEPENDS=(freetype2 libjpeg libogg liborbital libpng libvorbis llvm mesa sdl2 sdl2-ttf zlib)
+BUILD_DEPENDS=(freetype2 libjpeg libogg liborbital libpng libvorbis llvm18 mesa sdl2 sdl2-ttf zlib)

 function recipe_version {
    echo "$VERSION"
--- a/recipes/games/openjk/recipe.toml
+++ b/recipes/games/openjk/recipe.toml
@ -8,7 +8,7 @@ dependencies = [
    "libjpeg",
    "liborbital",
    "libpng",
-    "llvm",
+    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/games/sm64ex/recipe.toml
+++ b/recipes/games/sm64ex/recipe.toml
@ -5,7 +5,7 @@ git = "https://github.com/jackpot51/sm64ex.git"
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm",
+    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/games/spacecadetpinball/recipe.toml
+++ b/recipes/games/spacecadetpinball/recipe.toml
@ -9,7 +9,7 @@ dependencies = [
    "libogg",
    "liborbital",
    "libvorbis",
-    "llvm",
+    "llvm18",
    "mesa",
    "sdl2",
    "sdl2-mixer",
--- a/recipes/games/vvvvvv/recipe.sh
+++ b/recipes/games/vvvvvv/recipe.sh
@ -2,7 +2,7 @@ VERSION=2.0
 GIT=https://github.com/xTibor/VVVVVV
 BRANCH=redox
 GIT_UPSTREAM=https://github.com/TerryCavanagh/VVVVVV
-BUILD_DEPENDS=(sdl2-image sdl2-mixer sdl2 liborbital llvm mesa mesa-glu zlib libogg libvorbis)
+BUILD_DEPENDS=(sdl2-image sdl2-mixer sdl2 liborbital llvm18 mesa mesa-glu zlib libogg libvorbis)

 function recipe_version {
    printf "1.0.0"
--- a/recipes/games/wesnoth/recipe.sh
+++ b/recipes/games/wesnoth/recipe.sh
@ -9,7 +9,7 @@ BUILD_DEPENDS=(
    liborbital
    libpng
    libvorbis
-    llvm
+    llvm18
    mesa mesa-glu
    pcre
    pixman
--- a/recipes/libs/ffmpeg6/recipe.toml
+++ b/recipes/libs/ffmpeg6/recipe.toml
@ -10,7 +10,7 @@ patches = [
 template = "custom"
 dependencies = [
    "liborbital",
-    "llvm",
+    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/libs/mesa/recipe.toml
+++ b/recipes/libs/mesa/recipe.toml
@ -7,7 +7,7 @@ branch = "redox-24.0"
 template = "custom"
 dependencies = [
    "expat",
-    "llvm",
+    "llvm18",
    "zlib",
 ]
 script = """
--- a/recipes/libs/sdl2-image/recipe.toml
+++ b/recipes/libs/sdl2-image/recipe.toml
@ -7,7 +7,7 @@ dependencies = [
    "libjpeg",
    "liborbital",
    "libpng",
-    "llvm",
+    "llvm18",
    "mesa",
    "sdl2",
    "zlib",
--- a/recipes/libs/sdl2-mixer/recipe.toml
+++ b/recipes/libs/sdl2-mixer/recipe.toml
@ -6,7 +6,7 @@ template = "custom"
 dependencies = [
    "sdl2",
    "liborbital",
-    "llvm",
+    "llvm18",
    "mesa",
    "zlib",
    "libogg",
--- a/recipes/libs/sdl2-ttf/recipe.sh
+++ b/recipes/libs/sdl2-ttf/recipe.sh
@ -1,6 +1,6 @@
 VERSION=2.0.15
 TAR=https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl2 liborbital llvm mesa freetype2 libpng zlib)
+BUILD_DEPENDS=(sdl2 liborbital llvm18 mesa freetype2 libpng zlib)

 function recipe_version {
    echo "$VERSION"
--- a/recipes/libs/webrender/recipe.sh
+++ b/recipes/libs/webrender/recipe.sh
@ -1,7 +1,7 @@
 GIT=https://gitlab.redox-os.org/redox-os/webrender.git
 GIT_UPSTREAM=https://github.com/servo/webrender.git
 BRANCH=redox
-BUILD_DEPENDS=(freetype2 libpng llvm mesa zlib)
+BUILD_DEPENDS=(freetype2 libpng llvm18 mesa zlib)

 function recipe_build {
    sysroot="$(realpath ../sysroot)"