add llvm 3.3

2 files changed, 13 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ca2ba9dbd53..8696008f6ad9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Nov 20 13:56:05 UTC 2016
+# Mon Nov 21 17:49:10 UTC 2016
 pkgbase = panda-qemu-git
 	pkgdesc = An open-source Platform for Architecture-Neutral Dynamic Analysis
 	pkgver = r1715.f758bee
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/moyix/panda
 	arch = x86_64
 	license = GPLv2
@@ -18,11 +18,8 @@ pkgbase = panda-qemu-git
 	depends = libelf
 	depends = wireshark-cli
 	depends = distorm
+	depends = llvm33
 	source = git+git://github.com/moyix/panda.git#branch=master
-	source = https://archive.archlinux.org/packages/l/llvm/llvm-3.3-1-x86_64.pkg.tar.xz
-	source = https://archive.archlinux.org/packages/l/llvm/llvm-3.3-1-x86_64.pkg.tar.xz.sig
-	md5sums = SKIP
-	md5sums = 4031a3ad28f9ecdb2d531f8cd5d6685e
 	md5sums = SKIP
 
 pkgname = panda-qemu-git
diff --git a/PKGBUILD b/PKGBUILD
index 2a46c6507c2c..acb44bfa71ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,17 @@
 
 pkgname=panda-qemu-git
 pkgver=r1715.f758bee
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source Platform for Architecture-Neutral Dynamic Analysis"
 url="https://github.com/moyix/panda"
 arch=('x86_64')
 license=('GPLv2')
 
 makedepends=('git')
-depends=('libdwarf' 'nasm' 'openssl' 'libpcap' 'wget' 'protobuf-c' 'python2-pycparser' 'libelf' 'wireshark-cli' 'distorm')
-source=("git+git://github.com/moyix/panda.git#branch=master"
-"https://archive.archlinux.org/packages/l/llvm/llvm-3.3-1-x86_64.pkg.tar.xz"{,.sig})
-validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras
-md5sums=('SKIP'
-         '4031a3ad28f9ecdb2d531f8cd5d6685e'
-         'SKIP')
+depends=('libdwarf' 'nasm' 'openssl' 'libpcap' 'wget' 'protobuf-c' 'python2-pycparser' 'libelf' 'wireshark-cli' 'distorm' 'llvm33')
+source=("git+git://github.com/moyix/panda.git#branch=master")
+validpgpkeys=('C13549BB82A17681BF7143C2B4468DF4E95C63DC') # Bill Wendling
+md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/panda"
@@ -23,7 +20,7 @@ pkgver() {
 }
 
 prepare() {
-  cd "panda/qemu"
+  cd "${srcdir}/panda/qemu"
 
   # specify python2 explicitly
   sed -i 's,#!/usr/bin/python,#!/usr/bin/python2,g' $(find "${srcdir}/panda" -name "*.py")
@@ -42,18 +39,18 @@ prepare() {
   # fix some perl syntax
   sed -i 's,\$column =~ s\/\^\\@strong{(\.\*)}\$\/\$1\/;,$column =~ s/^\\@strong\\{(.*)}$/$1/;,g' "${srcdir}/panda/qemu/scripts/texi2pod.pl"
 
-  #TODO: get LLVM3.3 in here
-
   python2 ../scripts/apigen.py
   sh ./pp.sh
   ./configure \
+    --enable-llvm \
+    --with-llvm="/opt/llvm33" \
     --python=python2 \
-    --target-list=x86_64-softmmu,i386-softmmu,arm-softmmu\
+    --target-list=x86_64-softmmu,i386-softmmu,arm-softmmu \
     --prefix="${pkgdir}/opt/${pkgname}" \
     --disable-pie \
     --disable-xen \
     --disable-libiscsi \
-    --extra-cflags="-O2 -I/usr/local/include -I/usr/include/libdwarf" \
+    --extra-cflags="-O2 -I${srcdir}/usr/include -I/usr/local/include -I/usr/include/libdwarf" \
     --extra-cxxflags="-O2" \
     --extra-ldflags="-L/usr/local/lib -L/usr/local/lib64 -lprotobuf-c -lprotobuf -lpthread"
 }