[arch-commits] Commit in ispc/trunk (PKGBUILD llvm-11.1.0.patch)

[Evangelos Foutras]

    Date: Wednesday, February 17, 2021 @ 18:49:09
  Author: foutrelis
Revision: 862616

upgpkg: ispc 1.15.0-2: clang 11.1.0 rebuild

Added:
  ispc/trunk/llvm-11.1.0.patch
Modified:
  ispc/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    7 +++++--
 llvm-11.1.0.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-17 18:39:23 UTC (rev 862615)
+++ PKGBUILD	2021-02-17 18:49:09 UTC (rev 862616)
@@ -3,7 +3,7 @@
 
 pkgname=ispc
 pkgver=1.15.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Compiler for high-performance SIMD programming on the CPU"
 arch=(x86_64)
 url="https://ispc.github.io/"
@@ -11,12 +11,15 @@
 depends=(ncurses zlib llvm-libs clang)
 makedepends=(llvm python lib32-glibc cmake) # level-zero-headers level-zero-loader openmp spirv-llvm-translator vc-intrinsics)
 source=(https://github.com/ispc/ispc/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+        llvm-11.1.0.patch
         ispc-libclang-cpp.patch)
-sha256sums=('788f44abefa508644384307c9ea69ef311ce5d4cfcb513b89e56d08f04d0d4be'
+sha256sums=('2658ff00dc045ac9fcefbf6bd26dffaf723b059a942a27df91bbb61bc503a285'
+            'fd2bc96a65656350629918be8c57682d1936ddbe37d410d8c8667538dc992cac'
             'f6a162b8b60e0a0d17526c4e70bf9bc681c0e16cfee2b8cde1d7f9a5a99b8e78')
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  patch -p1 -i ../llvm-11.1.0.patch # Fix build with LLVM 11.1.0
   patch -p1 -i ../ispc-libclang-cpp.patch # Build with unified libclang-cpp.so
   # Remove tests that requires DUMPS (https://github.com/ispc/ispc/issues/1752)
   sed -i '/debug-phase/d' tests/lit-tests/arg_parsing_errors.ispc

Added: llvm-11.1.0.patch
===================================================================
--- llvm-11.1.0.patch	                        (rev 0)
+++ llvm-11.1.0.patch	2021-02-17 18:49:09 UTC (rev 862616)
@@ -0,0 +1,40 @@
+From 3cf2c0ade52eb1e25af7ceef30a62c81b6887bae Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar at redhat.com>
+Date: Sat, 23 Jan 2021 03:10:11 +0000
+Subject: [PATCH] Hard-code LLVM_VERSION_MINOR to 0 to fix build with llvm
+ 11.1.0
+
+---
+ cmake/LLVMConfig.cmake | 2 +-
+ src/ispc_version.h     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/LLVMConfig.cmake b/cmake/LLVMConfig.cmake
+index 8f5d6cf4..f6e1ef82 100644
+--- a/cmake/LLVMConfig.cmake
++++ b/cmake/LLVMConfig.cmake
+@@ -38,7 +38,7 @@ find_package(LLVM REQUIRED CONFIG)
+         message(FATAL_ERROR "LLVM package can't be found. \
+                 Set CMAKE_PREFIX_PATH variable to LLVM's installation prefix.")
+     endif()
+-    set(LLVM_VERSION "LLVM_${LLVM_VERSION_MAJOR}_${LLVM_VERSION_MINOR}")
++    set(LLVM_VERSION "LLVM_${LLVM_VERSION_MAJOR}_0")
+     message(STATUS "Found LLVM ${LLVM_VERSION}")
+ 
+ find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config
+diff --git a/src/ispc_version.h b/src/ispc_version.h
+index 75c2f38f..fa57042d 100644
+--- a/src/ispc_version.h
++++ b/src/ispc_version.h
+@@ -42,7 +42,7 @@
+ #define ISPC_VERSION "1.15.0"
+ #include <llvm/Config/llvm-config.h>
+ 
+-#define ISPC_LLVM_VERSION (LLVM_VERSION_MAJOR * 10000 + LLVM_VERSION_MINOR * 100)
++#define ISPC_LLVM_VERSION (LLVM_VERSION_MAJOR * 10000 + 0 * 100)
+ 
+ #define ISPC_LLVM_8_0 80000
+ #define ISPC_LLVM_9_0 90000
+-- 
+2.26.2
+