[arch-commits] Commit in ispc/trunk (2 files)

[Bruno Pagani]

    Date: Friday, March 9, 2018 @ 16:27:36
  Author: archange
Revision: 305380

upgpkg: ispc 1.9.2-1

Python 3 has been supported for a while.
Fix compiling with our LLVM by using Fedora patch.

Added:
  ispc/trunk/0001-Remove-uses-of-LLVM-dump-functions.patch
Modified:
  ispc/trunk/PKGBUILD

-----------------------------------------------+
 0001-Remove-uses-of-LLVM-dump-functions.patch |   84 ++++++++++++++++++++++++
 PKGBUILD                                      |   31 ++++----
 2 files changed, 99 insertions(+), 16 deletions(-)

Added: 0001-Remove-uses-of-LLVM-dump-functions.patch
===================================================================
--- 0001-Remove-uses-of-LLVM-dump-functions.patch	                        (rev 0)
+++ 0001-Remove-uses-of-LLVM-dump-functions.patch	2018-03-09 16:27:36 UTC (rev 305380)
@@ -0,0 +1,84 @@
+From 758e152a4832311818ea5b2bff0ac2e438b7a88a Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar at redhat.com>
+Date: Tue, 24 Oct 2017 09:45:53 -0700
+Subject: [PATCH] Remove uses of LLVM dump() functions
+
+These aren't exposed in release builds.
+---
+ llvmutil.cpp |  3 ++-
+ opt.cpp      | 10 +++++-----
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/llvmutil.cpp b/llvmutil.cpp
+index 02bd729..b98b5f1 100644
+--- a/llvmutil.cpp
++++ b/llvmutil.cpp
+@@ -45,6 +45,7 @@
+   #include <llvm/IR/Instructions.h>
+   #include <llvm/IR/BasicBlock.h>
+ #endif
++#include <llvm/Support/raw_os_ostream.h>
+ #include <set>
+ #include <map>
+ 
+@@ -1516,7 +1517,7 @@ lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
+         return;
+ 
+     fprintf(stderr, "  ");
+-    v->dump();
++    v->print(llvm::errs());
+     done.insert(v);
+ 
+     if (inst == NULL)
+diff --git a/opt.cpp b/opt.cpp
+index ef9e4c5..48106f4 100644
+--- a/opt.cpp
++++ b/opt.cpp
+@@ -169,7 +169,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass();
+                   strlen(getenv("FUNC"))))) {                           \
+         fprintf(stderr, "Start of " NAME "\n");                \
+         fprintf(stderr, "---------------\n");                  \
+-        bb.dump();                                             \
++        bb.print(llvm::errs());                                \
+         fprintf(stderr, "---------------\n\n");                \
+     } else /* eat semicolon */
+ 
+@@ -180,7 +180,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass();
+                   strlen(getenv("FUNC"))))) {                           \
+         fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \
+         fprintf(stderr, "---------------\n");                  \
+-        bb.dump();                                             \
++        bb.print(llvm::errs());                                \
+         fprintf(stderr, "---------------\n\n");                \
+     } else /* eat semicolon */
+ 
+@@ -533,7 +533,7 @@ void
+ Optimize(llvm::Module *module, int optLevel) {
+     if (g->debugPrint) {
+         printf("*** Code going into optimization ***\n");
+-        module->dump();
++        module->print(llvm::errs(), nullptr);
+     }
+     DebugPassManager optPM;
+     optPM.add(llvm::createVerifierPass(),0);
+@@ -928,7 +928,7 @@ Optimize(llvm::Module *module, int optLevel) {
+ 
+     if (g->debugPrint) {
+         printf("\n*****\nFINAL OUTPUT\n*****\n");
+-        module->dump();
++        module->print(llvm::errs(), nullptr);
+     }
+ 
+ }
+@@ -4859,7 +4859,7 @@ bool
+ DebugPass::runOnModule(llvm::Module &module) {
+     fprintf(stderr, "%s", str_output);
+     fflush(stderr);
+-    module.dump();
++    module.print(llvm::errs(), nullptr);
+     return true;
+ }
+ 
+-- 
+1.8.3.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-09 16:15:51 UTC (rev 305379)
+++ PKGBUILD	2018-03-09 16:27:36 UTC (rev 305380)
@@ -1,35 +1,34 @@
 # $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
 pkgname=ispc
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="A compiler for high-performance SIMD programming on the CPU"
 arch=('x86_64')
 url="https://ispc.github.io/"
 license=('BSD')
-depends=('ncurses' 'zlib')
-makedepends=('llvm' 'clang' 'python2')
-makedepends_x86_64=('lib32-glibc')
-source=("$pkgname-${pkgver}.tar.gz::https://github.com/ispc/ispc/archive/v${pkgver}.tar.gz")
-md5sums=('b9a4e7c21c50900e836ef1626191e03b')
+depends=('ncurses' 'zlib' 'llvm-libs')
+makedepends=('llvm' 'clang' '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
+sha256sums=('76a14e22f05a52fb0b30142686a6cb144b0415b39be6c9fcd3f17ac23447f0b2'
+            'aed52cba60197bd20b2aef12e93e2e640d3ef2596bf154fe4a6e0980cfe78cca')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # fix python version
-  find . -name "*.py" -exec sed -i 's|python$|python2|' '{}' ';'
-  sed -i 's|python |python2 |' Makefile
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ../0001-Remove-uses-of-LLVM-dump-functions.patch
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd ${pkgname}-${pkgver}
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -D -m755 ispc "$pkgdir/usr/bin/ispc"
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+  cd ${pkgname}-${pkgver}
+  install -Dm755 ispc -t "${pkgdir}"/usr/bin/
+  install -Dm644 LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}
 }