From 806f38d805b1a5a65fbb9adda779fedc84c52fb2 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Thu, 16 Mar 2023 09:17:37 -0300 Subject: [PATCH] Update to LLVM 16.0.0 RC4 Start using LLVM_THIRD_PARTY_DIR in order to remove 0001-Changes-the-path-to-gtest.patch. --- 0001-Changes-the-path-to-gtest.patch | 28 ---------------------------- mlir.spec | 8 +++++--- sources | 4 ++-- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 0001-Changes-the-path-to-gtest.patch diff --git a/0001-Changes-the-path-to-gtest.patch b/0001-Changes-the-path-to-gtest.patch deleted file mode 100644 index 52d2f8e..0000000 --- a/0001-Changes-the-path-to-gtest.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd28ef5af20028f233b2fd6de68f4ba7e4992da1 Mon Sep 17 00:00:00 2001 -From: Tulio Magno Quites Machado Filho -Date: Fri, 17 Feb 2023 19:13:35 -0300 -Subject: [PATCH] Changes the path to gtest - ---- - mlir/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt -index c9b0d53bc3e9..af83f8132405 100644 ---- a/mlir/CMakeLists.txt -+++ b/mlir/CMakeLists.txt -@@ -184,7 +184,10 @@ add_subdirectory(lib/CAPI) - if (MLIR_INCLUDE_TESTS) - add_definitions(-DMLIR_INCLUDE_TESTS) - add_custom_target(MLIRUnitTests) -- if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h) -+ -+ # Check for gtest -+ set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/utils/unittest) -+ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h) - add_subdirectory(unittests) - else() - message(WARNING "gtest not found, unittests will not be available") --- -2.39.1 - diff --git a/mlir.spec b/mlir.spec index 3210e57..9bd1db3 100644 --- a/mlir.spec +++ b/mlir.spec @@ -1,7 +1,7 @@ %global maj_ver 16 %global min_ver 0 %global patch_ver 0 -%global rc_ver 3 +%global rc_ver 4 %global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} %global mlir_srcdir llvm-project-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src %global cmake_srcdir cmake-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src @@ -23,12 +23,10 @@ Source2: release-keys.asc Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig -Patch0: 0001-Changes-the-path-to-gtest.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: gtest BuildRequires: ninja-build BuildRequires: zlib-devel BuildRequires: llvm-devel = %{version} @@ -93,6 +91,7 @@ mv %{cmake_srcdir} cmake -DLLVM_BUILD_LLVM_DYLIB=ON \ -DCMAKE_PREFIX_PATH=%{_libdir}/cmake/llvm/ \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ + -DLLVM_THIRD_PARTY_DIR=%{_datadir}/llvm/src/utils \ -DLLVM_BUILD_TOOLS:BOOL=ON \ -DLLVM_BUILD_UTILS:BOOL=ON \ -DMLIR_INCLUDE_DOCS:BOOL=ON \ @@ -197,6 +196,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_libdir}/cmake/mlir %changelog +* Wed Mar 15 2023 Tulio Magno Quites Machado Filho - 16.0.0~rc4-1 +- Update to LLVM 16.0.0 RC4 + * Thu Feb 23 2023 Tulio Magno Quites Machado Filho - 16.0.0~rc3-1 - Update to LLVM 16.0.0 RC3 diff --git a/sources b/sources index 7598a5b..81eebf6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (llvm-project-15.0.7.src.tar.xz) = 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52 -SHA512 (llvm-project-15.0.7.src.tar.xz.sig) = fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2 +SHA512 (llvm-project-16.0.0rc4.src.tar.xz) = 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc +SHA512 (llvm-project-16.0.0rc4.src.tar.xz.sig) = 2af72e3d771e2361873007a944dcccfe81fbdbc3025a2101e03cbc15f1a173d39ceb94c4ae8966b1d7564bf004ee9a5ffa032e2334c0cf7154aea1090d04b00f