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

[Bruno Pagani]

    Date: Thursday, July 21, 2022 @ 11:46:29
  Author: archange
Revision: 1255018

Backport patch for the remaining odr violation

Modified:
  intel-graphics-compiler/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-21 11:35:02 UTC (rev 1255017)
+++ PKGBUILD	2022-07-21 11:46:29 UTC (rev 1255018)
@@ -4,7 +4,7 @@
 pkgname=intel-graphics-compiler
 epoch=1
 pkgver=1.0.11485
-pkgrel=7
+pkgrel=8
 pkgdesc="Intel Graphics Compiler for OpenCL"
 arch=(x86_64)
 url="https://github.com/intel/intel-graphics-compiler"
@@ -21,7 +21,8 @@
         ${pkgname}-avoid-duplicate-entries.patch::https://github.com/intel/intel-graphics-compiler/commit/12332c1ee8e92238c919ad7c2aa36119259cb622.patch
         ${pkgname}-rework-kernel-metadata.patch::https://github.com/intel/intel-graphics-compiler/commit/6a13fa903f380e17378286a7cd43995b0ae162ad.patch
         fix-AlignmentAnalysis-test-failures-on-LLVM-14.patch
-        ${pkgname}-namespace-IIT.patch::https://github.com/intel/intel-graphics-compiler/commit/8b49f42e8148284815b4c31bf1c280e7ae2b03be.patch)
+        ${pkgname}-namespace-IIT.patch::https://github.com/intel/intel-graphics-compiler/commit/8b49f42e8148284815b4c31bf1c280e7ae2b03be.patch
+        ${pkgname}-namespace-vc.patch::https://github.com/intel/intel-graphics-compiler/commit/42e32345a3d88aeaa2d28af237bb5aa4ccccf8b3.patch)
 sha256sums=('a2bcb5a96c64691b21ab6b573a2b09dbe1354272281cf640f4d43ecd7753e25f'
             '41ad4d72b4f5e00161d736c8f51c9a2421548d226511cd133143408fccc4bfd0'
             '474d5ad34fa4c7c447190470346f8a944f105a11b1c95c2cded1fc28934fea48'
@@ -31,7 +32,8 @@
             '0c5fe7d98bf6b0f8e288b91fe139cfe7f0dcb89b55e6c471af9b0a026a94781a'
             '60b96639a7247f7bf86f451135881afd387f692e1a84c9a8695dc5a39ec3a3f2'
             '6652f7249f1c2b0aa3fa31837df8f494bad8badb8373988c91a15e08807c80a5'
-            '5f760fc20fcbd3184b3a7d893c7daa6f3d88568e368cc1129ce47eb48685463a')
+            '5f760fc20fcbd3184b3a7d893c7daa6f3d88568e368cc1129ce47eb48685463a'
+            'c02d98852d0472d00a4826c99cfedb9231309100d983ce6684cc2dea8f0b0753')
 
 prepare() {
   patch -p1 -d ${pkgname}-igc-${pkgver} < fix-zlib-linking.patch
@@ -43,11 +45,10 @@
   patch -p1 -d ${pkgname}-igc-${pkgver} < ${pkgname}-rework-kernel-metadata.patch
   patch -p1 -d ${pkgname}-igc-${pkgver} < fix-AlignmentAnalysis-test-failures-on-LLVM-14.patch
   patch -p1 -d ${pkgname}-igc-${pkgver} < ${pkgname}-namespace-IIT.patch
+  patch -p1 -d ${pkgname}-igc-${pkgver} < ${pkgname}-namespace-vc.patch
 }
 
 build() {
-  export CFLAGS="$CFLAGS -Wno-error=odr"
-  export CXXFLAGS="$CXXFLAGS -Wno-error=odr"
   cmake -B build -S ${pkgname}-igc-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \