[arch-commits] Commit in intel-graphics-compiler/trunk (2 files)

[Bruno Pagani]

    Date: Monday, June 27, 2022 @ 09:38:31
  Author: archange
Revision: 1239627

LLVM14 rebuild

Added:
  intel-graphics-compiler/trunk/fix-zlib-linking.patch
Modified:
  intel-graphics-compiler/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   19 +++++++++++++++----
 fix-zlib-linking.patch |   14 ++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-27 08:59:15 UTC (rev 1239626)
+++ PKGBUILD	2022-06-27 09:38:31 UTC (rev 1239627)
@@ -4,7 +4,7 @@
 pkgname=intel-graphics-compiler
 epoch=1
 pkgver=1.0.11378
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel Graphics Compiler for OpenCL"
 arch=(x86_64)
 url="https://github.com/intel/intel-graphics-compiler"
@@ -13,10 +13,21 @@
 makedepends=(git cmake clang lld llvm python libunwind spirv-headers vc-intrinsics)
 # https://github.com/intel/intel-graphics-compiler/issues/237
 options=(!emptydirs !lto)
-source=(${url}/archive/igc-${pkgver}.tar.gz)
-sha256sums=('527229e8b7d7773e128a12fa5577ea0193643479b0bc23906d9872384604a7dc')
+source=(${url}/archive/igc-${pkgver}.tar.gz
+        fix-zlib-linking.patch
+        ${pkgname}-${pkgver}-llvm14.patch::https://github.com/liushuyu/intel-graphics-compiler/commit/6a318ce3467f84ef88188e9ac7e2eca251975441.patch)
+sha256sums=('527229e8b7d7773e128a12fa5577ea0193643479b0bc23906d9872384604a7dc'
+            '41ad4d72b4f5e00161d736c8f51c9a2421548d226511cd133143408fccc4bfd0'
+            'aa8994212c65d237ee7211fadb7c422c162716e204feaf6b48a9e3e7d6c39970')
 
+prepare() {
+  patch -p1 -d ${pkgname}-igc-${pkgver} < fix-zlib-linking.patch
+  patch -p1 -d ${pkgname}-igc-${pkgver} < ${pkgname}-${pkgver}-llvm14.patch
+}
+
 build() {
+  export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
+  export CXXFLAGS="$CXXFLAGS -Wno-error=deprecated-declarations"
   cmake -B build -S ${pkgname}-igc-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -24,7 +35,7 @@
     -DIGC_OPTION__ARCHITECTURE_TARGET='Linux64' \
     -DIGC_OPTION__CLANG_MODE=Prebuilds \
     -DIGC_OPTION__LLD_MODE=Prebuilds \
-    -DIGC_OPTION__LLVM_PREFERRED_VERSION='13.0.1' \
+    -DIGC_OPTION__LLVM_PREFERRED_VERSION='14.0.6' \
     -DIGC_OPTION__LLVM_MODE=Prebuilds \
     -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON \
     -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS=ON \

Added: fix-zlib-linking.patch
===================================================================
--- fix-zlib-linking.patch	                        (rev 0)
+++ fix-zlib-linking.patch	2022-06-27 09:38:31 UTC (rev 1239627)
@@ -0,0 +1,14 @@
+--- a/IGC/cmake/igc_find_liblldELF.cmake
++++ b/IGC/cmake/igc_find_liblldELF.cmake
+@@ -136,6 +136,11 @@ elseif(IGC_BUILD__LLVM_PREBUILDS)
+     ${LLD_ELF_LLVM_DEPS}
+     lldCommon)
+ 
++  if(LLVM_ENABLE_ZLIB)
++    find_package(ZLIB)
++    target_link_libraries(lldELF INTERFACE ZLIB::ZLIB)
++  endif()
++
+   find_path(
+     LLD_INCLUDE_DIR
+     NAMES "Driver.h"