[arch-commits] Commit in mesa/trunk (PKGBUILD llvm32.patch)

[andyrtr at archlinux.org]

    Date: Monday, December 31, 2012 @ 04:55:48
  Author: andyrtr
Revision: 173981

make it compile again with llvm

Modified:
  mesa/trunk/PKGBUILD
  mesa/trunk/llvm32.patch

--------------+
 PKGBUILD     |    7 +++++--
 llvm32.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-31 06:22:31 UTC (rev 173980)
+++ PKGBUILD	2012-12-31 09:55:48 UTC (rev 173981)
@@ -17,7 +17,7 @@
 pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' 
-             'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm>=3.2' 'systemd' 'libvdpau>=0.5')
+             'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm-amdgpu-snapshot' 'systemd' 'libvdpau>=0.5')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
@@ -32,7 +32,7 @@
 )
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '9449d59e60e74200ecd1a46a449d0920'
+         '5fe9ad0c5beed19bc98d8c34aaad4ade'
          '97d6554c05ea7449398afe3a0ede7018')
 
 build() {
@@ -77,6 +77,9 @@
       $COMMONOPTS
 fi
 
+    # fix a build break with new llvm
+    sed -i "s:-Werror=implicit-function-declaration::" src/gallium/drivers/r600/Makefile
+
     make
 }
 

Modified: llvm32.patch
===================================================================
--- llvm32.patch	2012-12-31 06:22:31 UTC (rev 173980)
+++ llvm32.patch	2012-12-31 09:55:48 UTC (rev 173981)
@@ -251,3 +251,34 @@
  		alu.pred_sel = 0;
 --
 cgit v0.9.0.2-2-gbebe
+From f2f17fc348c847bbf5c54bb75b76e1661e8ced60 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <thomas.stellard at amd.com>
+Date: Mon, 01 Oct 2012 21:01:06 +0000
+Subject: radeon/llvm: Only initialize the AMDGPU target
+
+---
+diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
+index 625b0b4..2f2eb4c 100644
+--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
++++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
+@@ -86,17 +86,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
+ 
+    Triple AMDGPUTriple(sys::getDefaultTargetTriple());
+ 
+-#ifdef EXTERNAL_LLVM
+-   /* XXX: Can we just initialize the AMDGPU target here? */
+-   InitializeAllTargets();
+-   InitializeAllTargetMCs();
+-   InitializeAllAsmPrinters();
+-#else
+    LLVMInitializeAMDGPUTargetInfo();
+    LLVMInitializeAMDGPUTarget();
+    LLVMInitializeAMDGPUTargetMC();
+    LLVMInitializeAMDGPUAsmPrinter();
+-#endif
++
+    std::string err;
+    const Target * AMDGPUTarget = TargetRegistry::lookupTarget("r600", err);
+    if(!AMDGPUTarget) {
+--
+cgit v0.9.0.2-2-gbebe