MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rust-llvm: Disable benchmarks by cmake options

Browse Source 
Drop patch to exclusively disable it in code
It seems to be fixed upstream [1]

[1] https://github.com/rust-lang/cmake-rs/pull/158

(From OE-Core rev: 60b4b0808a3b961917ed8abe16b9f7df2a311952)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2025-04-02 22:23:43 -07:00 committed by Richard Purdie
parent f42a153439
commit e11fc01d7b
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/recipes-devtools/rust/rust-llvm/0003-llvm-fix-include-benchmarks.patch
View File

@ -1,25 +0,0 @@
Subject: LLVM_INCLUDE_BENCHMARKS with llvm 14.0.1 failing to build
https://github.com/llvm/llvm-project/issues/54941
The LLVM_INCLUDE_BENCHMARKS is turned OFF to fix the build error as
per the discussions in the above link. We will work on the issue and
replace the workaround with actual fix once committed in LLVM.
Please refer the following link for more discussions on the issue:-
https://github.com/rust-lang/rust/issues/96054
Upstream-Status: Pending
Signed-off-by: Pgowda <pgowda.cve@gmail.com>
--- a/llvm/CMakeLists.txt 2022-04-22 00:45:30.543445478 -0700
+++ b/llvm/CMakeLists.txt 2022-04-22 00:45:42.095232974 -0700
@@ -615,7 +615,7 @@ option(LLVM_INCLUDE_GO_TESTS "Include th
option(LLVM_BUILD_BENCHMARKS "Add LLVM benchmark targets to the list of default
targets. If OFF, benchmarks still could be built using Benchmarks target." OFF)
-option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." ON)
+option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." OFF)
option (LLVM_BUILD_DOCS "Build the llvm documentation." OFF)
option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON)

2
meta/recipes-devtools/rust/rust-llvm_1.85.1.bb
View File

@ -10,7 +10,6 @@ require rust-source.inc
SRC_URI += "file://0002-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \
file://0003-llvm-fix-include-benchmarks.patch;striplevel=2 \
"
S = "${RUSTSRC}/src/llvm-project/llvm"
@ -50,6 +49,7 @@ EXTRA_OECMAKE = " \
-DLLVM_INCLUDE_EXAMPLES=OFF \
-DLLVM_BUILD_TESTS=OFF \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_BENCHMARKS=OFF \
-DLLVM_TARGET_ARCH=${TARGET_ARCH} \
-DCMAKE_INSTALL_PREFIX:PATH=${libdir}/llvm-rust \
"