From 5e66c2fb2699333d635bee1be236993f89f4fbf5 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Fri, 7 Jun 2024 18:55:31 +0000 Subject: [PATCH] Add ABI separation on the LLVM recipe --- recipes/demos/gears/recipe.sh | 2 +- recipes/demos/glium/recipe.sh | 2 +- recipes/demos/osdemo/recipe.sh | 2 +- recipes/demos/sdl2-gears/recipe.sh | 2 +- recipes/dev/{llvm => llvm18}/native.cmake | 0 recipes/dev/{llvm => llvm18}/recipe.toml | 0 recipes/dev/rust/recipe.sh | 2 +- recipes/games/classicube/recipe.toml | 2 +- recipes/games/hematite/recipe.toml | 2 +- recipes/games/neverball/recipe.sh | 2 +- recipes/games/openjk/recipe.toml | 2 +- recipes/games/sm64ex/recipe.toml | 2 +- recipes/games/spacecadetpinball/recipe.toml | 2 +- recipes/games/vvvvvv/recipe.sh | 2 +- recipes/games/wesnoth/recipe.sh | 2 +- recipes/libs/ffmpeg6/recipe.toml | 2 +- recipes/libs/mesa/recipe.toml | 2 +- recipes/libs/sdl2-image/recipe.toml | 2 +- recipes/libs/sdl2-mixer/recipe.toml | 2 +- recipes/libs/sdl2-ttf/recipe.sh | 2 +- recipes/libs/webrender/recipe.sh | 2 +- 21 files changed, 19 insertions(+), 19 deletions(-) rename recipes/dev/{llvm => llvm18}/native.cmake (100%) rename recipes/dev/{llvm => llvm18}/recipe.toml (100%) diff --git a/recipes/demos/gears/recipe.sh b/recipes/demos/gears/recipe.sh index 47067cf10..b43a70fe4 100644 --- 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" diff --git a/recipes/demos/glium/recipe.sh b/recipes/demos/glium/recipe.sh index 4a9a51ff1..455618c1f 100644 --- 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" diff --git a/recipes/demos/osdemo/recipe.sh b/recipes/demos/osdemo/recipe.sh index 5476214e2..c222548f7 100644 --- 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" diff --git a/recipes/demos/sdl2-gears/recipe.sh b/recipes/demos/sdl2-gears/recipe.sh index 949a00727..ae0f8c4ee 100644 --- 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" diff --git a/recipes/dev/llvm/native.cmake b/recipes/dev/llvm18/native.cmake similarity index 100% rename from recipes/dev/llvm/native.cmake rename to recipes/dev/llvm18/native.cmake diff --git a/recipes/dev/llvm/recipe.toml b/recipes/dev/llvm18/recipe.toml similarity index 100% rename from recipes/dev/llvm/recipe.toml rename to recipes/dev/llvm18/recipe.toml diff --git a/recipes/dev/rust/recipe.sh b/recipes/dev/rust/recipe.sh index 81cd8a97e..fb417a310 100644 --- 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 diff --git a/recipes/games/classicube/recipe.toml b/recipes/games/classicube/recipe.toml index 591968213..d78d3c5a7 100644 --- 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", diff --git a/recipes/games/hematite/recipe.toml b/recipes/games/hematite/recipe.toml index e7cbb8924..c34240441 100644 --- 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" ] diff --git a/recipes/games/neverball/recipe.sh b/recipes/games/neverball/recipe.sh index ba83e15e8..c1ce70eb4 100644 --- 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" diff --git a/recipes/games/openjk/recipe.toml b/recipes/games/openjk/recipe.toml index ce977d909..6e5b3c133 100644 --- 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", diff --git a/recipes/games/sm64ex/recipe.toml b/recipes/games/sm64ex/recipe.toml index e3d2fe73b..25a940056 100644 --- 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", diff --git a/recipes/games/spacecadetpinball/recipe.toml b/recipes/games/spacecadetpinball/recipe.toml index 706605aa1..39da0f0e0 100644 --- 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", diff --git a/recipes/games/vvvvvv/recipe.sh b/recipes/games/vvvvvv/recipe.sh index 531e3697b..7964cafb3 100644 --- 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" diff --git a/recipes/games/wesnoth/recipe.sh b/recipes/games/wesnoth/recipe.sh index b93029fd6..26fc0739a 100644 --- 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 diff --git a/recipes/libs/ffmpeg6/recipe.toml b/recipes/libs/ffmpeg6/recipe.toml index 1ef7aa6c4..c31a11c29 100644 --- 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", diff --git a/recipes/libs/mesa/recipe.toml b/recipes/libs/mesa/recipe.toml index 4b05987a9..9fd73d094 100644 --- 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 = """ diff --git a/recipes/libs/sdl2-image/recipe.toml b/recipes/libs/sdl2-image/recipe.toml index 1f87ce4c3..4c36128e0 100644 --- 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", diff --git a/recipes/libs/sdl2-mixer/recipe.toml b/recipes/libs/sdl2-mixer/recipe.toml index a78e19a3c..3f2c1e865 100644 --- 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", diff --git a/recipes/libs/sdl2-ttf/recipe.sh b/recipes/libs/sdl2-ttf/recipe.sh index bc365d15a..d6e4a81cc 100644 --- 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" diff --git a/recipes/libs/webrender/recipe.sh b/recipes/libs/webrender/recipe.sh index f68153d35..a275c3fb1 100644 --- 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)"