From 2a79c8853b9630dd7bdacdd5675920ecbdb02933 Mon Sep 17 00:00:00 2001 From: David Bliss Date: Wed, 1 Jan 2025 19:25:05 +0000 Subject: [PATCH] llvm19 --- Cargo.toml | 1 + build-aux/app.fotema.Fotema.Devel.json | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2aee67d..2d0678c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,7 @@ version = "0.1.0" authors = ["David Bliss "] edition = "2021" publish = false +rust-version = "1.83.0" [workspace] members = ["core"] diff --git a/build-aux/app.fotema.Fotema.Devel.json b/build-aux/app.fotema.Fotema.Devel.json index edc27c0..c6767f9 100644 --- a/build-aux/app.fotema.Fotema.Devel.json +++ b/build-aux/app.fotema.Fotema.Devel.json @@ -5,7 +5,7 @@ "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm18" + "org.freedesktop.Sdk.Extension.llvm19" ], "command": "fotema", "finish-args": [ @@ -20,8 +20,8 @@ "--env=RUST_LOG=fotema=debug,relm4=warn,glycin=warn" ], "build-options": { - "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin", - "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib", + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/bin", + "prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib", "build-args": [ "--share=network" ], @@ -70,11 +70,11 @@ "run-tests": true, "build-options": { - "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin", - "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib", + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/bin", + "prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib", "env": { "OPENCV_INCLUDE_PATHS": "/app/include/opencv4", - "LIBCLANG_PATH": "/usr/lib/sdk/llvm18/lib", + "LIBCLANG_PATH": "/usr/lib/sdk/llvm19/lib", "ORT_STRATEGY": "system" } },