rust-llvm: Disable benchmarks by cmake options

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

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>

diff --git a/meta/recipes-devtools/rust/rust-llvm/0003-llvm-fix-include-benchmarks.patch b/meta/recipes-devtools/rust/rust-llvm/0003-llvm-fix-include-benchmarks.patch
deleted file mode 100644 (file)
index ff31c0b..0000000
--- a/meta/recipes-devtools/rust/rust-llvm/0003-llvm-fix-include-benchmarks.patch
+++ /dev/null
@@ -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)

diff --git a/meta/recipes-devtools/rust/rust-llvm_1.85.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.85.1.bb
index 12d7b2f1817053cca204b051b076475ec36a482a..2ba37f0784ae7374e18a3712e316678a6f904987 100644 (file)
--- a/meta/recipes-devtools/rust/rust-llvm_1.85.1.bb
+++ b/meta/recipes-devtools/rust/rust-llvm_1.85.1.bb
@@ -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 \
 "