From 001d44fe225d1970ad4bf40ba99b31aa121bb091 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 15 Jun 2023 14:38:16 +0200 Subject: [PATCH] Use llvm-cmake-utils package --- ...Change-LLVM_COMMON_CMAKE_UTILS-usage.patch | 30 ------------------- mlir.spec | 10 ++++--- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch diff --git a/0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch deleted file mode 100644 index f4e0194..0000000 --- a/0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 500300bc35937e7cd3d7ae3a4c91c29c4f98033a Mon Sep 17 00:00:00 2001 -From: Tulio Magno Quites Machado Filho -Date: Mon, 27 Mar 2023 10:25:05 -0300 -Subject: [PATCH] [mlir] Change LLVM_COMMON_CMAKE_UTILS usage - -Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are -available and stop assuming its directory structure. ---- - mlir/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt -index af83f8132405..fbc192e2c187 100644 ---- a/mlir/CMakeLists.txt -+++ b/mlir/CMakeLists.txt -@@ -2,9 +2,9 @@ - cmake_minimum_required(VERSION 3.13.4) - - if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) -- set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) -+ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules) - endif() --include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake -+include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake - NO_POLICY_SCOPE) - - # Check if MLIR is built as a standalone project. --- -2.39.2 - diff --git a/mlir.spec b/mlir.spec index 8527e36..fd861b2 100644 --- a/mlir.spec +++ b/mlir.spec @@ -12,7 +12,7 @@ Name: mlir Version: %{mlir_version}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multi-Level Intermediate Representation Overview License: Apache-2.0 WITH LLVM-exception @@ -21,8 +21,6 @@ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ve Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{mlir_srcdir}.tar.xz.sig Source2: release-keys.asc -Patch0: 0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch - # Support for i686 upstream is unclear with lots of tests failling. ExcludeArch: i686 @@ -31,6 +29,7 @@ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: zlib-devel BuildRequires: llvm-devel = %{version} +BuildRequires: llvm-cmake-utils = %{version} BuildRequires: llvm-googletest = %{version} BuildRequires: llvm-test = %{version} BuildRequires: python3-lit @@ -93,7 +92,7 @@ MLIR development files. -DCMAKE_PREFIX_PATH=%{_libdir}/cmake/llvm/ \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ -DLLVM_THIRD_PARTY_DIR=%{_datadir}/llvm/src/utils \ - -DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm/ \ + -DLLVM_COMMON_CMAKE_UTILS=%{_datadir}/llvm/cmake \ -DLLVM_BUILD_TOOLS:BOOL=ON \ -DLLVM_BUILD_UTILS:BOOL=ON \ -DMLIR_INCLUDE_DOCS:BOOL=ON \ @@ -200,6 +199,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_libdir}/cmake/mlir %changelog +* Thu Jun 15 2023 Nikita Popov - 16.0.5-2 +- Use llvm-cmake-utils package + * Tue Jun 06 2023 Tulio Magno Quites Machado Filho - 16.0.5-1 - Update to LLVM 16.0.5