[arch-commits] Commit in ispc/trunk (PKGBUILD llvm6.0_compat.diff)

[Bruno Pagani]

    Date: Thursday, September 20, 2018 @ 08:18:23
  Author: archange
Revision: 383485

LLVM 7.0 rebuild

Required to redo LLVM6 compatibility in order to apply properly LLVM7 one.

Modified:
  ispc/trunk/PKGBUILD
Deleted:
  ispc/trunk/llvm6.0_compat.diff

---------------------+
 PKGBUILD            |   23 +++++++++++++++++++----
 llvm6.0_compat.diff |   13 -------------
 2 files changed, 19 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-20 07:53:52 UTC (rev 383484)
+++ PKGBUILD	2018-09-20 08:18:23 UTC (rev 383485)
@@ -3,7 +3,7 @@
 
 pkgname=ispc
 pkgver=1.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A compiler for high-performance SIMD programming on the CPU"
 arch=('x86_64')
 url="https://ispc.github.io/"
@@ -12,15 +12,30 @@
 makedepends=('llvm' 'python' 'lib32-glibc')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/ispc/ispc/archive/v${pkgver}.tar.gz"
         '0001-Remove-uses-of-LLVM-dump-functions.patch' # Borrowed from Fedora
-        'llvm6.0_compat.diff')
+        LLVM6-1.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1307.patch"
+        LLVM6-2.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1315.patch"
+        LLVM7-1.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1312.patch"
+        LLVM7-2.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1316.patch"
+        LLVM7-3.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1325.patch"
+        LLVM7-4.patch::"https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/1330.patch")
 sha256sums=('76a14e22f05a52fb0b30142686a6cb144b0415b39be6c9fcd3f17ac23447f0b2'
             'aed52cba60197bd20b2aef12e93e2e640d3ef2596bf154fe4a6e0980cfe78cca'
-            '22077998f02898bdb2fd14e4decbc894686d8a84dd9877dace9a222fa1e3b84b')
+            'e0846b0b7793bec1522a87696330bfdbd5c6b976d2f77389f5fe93c9de92386d'
+            '205468666cf985dd0634103c00a727e942ab330bddd2520f0d89e98e662cc495'
+            'ac02472507690def70643b96d01bf70a6dfab7e465351c6f4588696679f5fb61'
+            '3cb8a31ea5228972e2ecc3bd9c51d934fbd31f96babb93c2ef5d16e7f4e8aabd'
+            '0a8b878aa6e07c2cc561e9f60e9ecea274d1f77bf46a6413f151cdc0489a7ce2'
+            '39d2b606b4bfdd0c59ad384facc0d51894e6856439fe6fe4c2a09edaf4145f8b')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i ../0001-Remove-uses-of-LLVM-dump-functions.patch
-  patch -p1 -i ../llvm6.0_compat.diff
+  patch -p1 -i ../LLVM6-1.patch
+  patch -p1 -i ../LLVM6-2.patch
+  patch -p1 -i ../LLVM7-1.patch
+  patch -p1 -i ../LLVM7-2.patch
+  patch -p1 -i ../LLVM7-3.patch
+  patch -p1 -i ../LLVM7-4.patch
 }
 
 build() {

Deleted: llvm6.0_compat.diff
===================================================================
--- llvm6.0_compat.diff	2018-09-20 07:53:52 UTC (rev 383484)
+++ llvm6.0_compat.diff	2018-09-20 08:18:23 UTC (rev 383485)
@@ -1,13 +0,0 @@
-diff -rup ispc-1.9.2/ispc.cpp ispc-1.9.2.new/ispc.cpp
---- ispc-1.9.2/ispc.cpp	2017-11-11 00:07:30.000000000 +0100
-+++ ispc-1.9.2.new/ispc.cpp	2018-03-17 20:23:01.104377910 +0100
-@@ -59,7 +59,7 @@
-   #include <llvm/IR/Module.h>
-   #include <llvm/IR/Instructions.h>
- #endif
--#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_6 // LLVM 3.6+
-+#if ISPC_LLVM_VERSION >= ISPC_LLVM_3_6 && ISPC_LLVM_VERSION < ISPC_LLVM_6_0 // LLVM 3.6-6.0
-   #include <llvm/Target/TargetSubtargetInfo.h>
-   #if ISPC_LLVM_VERSION >= ISPC_LLVM_3_7 // LLVM 3.7+
-     #include <llvm/Target/TargetLowering.h>
-