summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre-multilib/lib32-mesa-libcl/PKGBUILD9
-rw-r--r--libre-multilib/lib32-mesa-libcl/llvm35.patch26
2 files changed, 34 insertions, 1 deletions
diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD
index 8fd571651..d2b5a47a6 100644
--- a/libre-multilib/lib32-mesa-libcl/PKGBUILD
+++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=libcl
pkgname=lib32-$pkgbase-$_pkgname
_pkgflag=libre
pkgver=10.2.7
-pkgrel=1
+pkgrel=2
pkgdesc='Mesa 3-D OpenCL library (32-bit)'
url=http://${pkgbase}3d.sourceforge.net
license=(
@@ -58,11 +58,18 @@ replaces=(
)
source=(
ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
+ llvm35.patch
)
sha512sums=(
c6d346499ef9596d3b5cd0bdc0ec64b58e8170203e0c977c54b55652c8792beb471822c101461745f7228a7d15a43924211f56fc0cc989defdc1acc4ea7b8a71
+ dbf6792c94c80e067f3d1a33237ca1e28be7069a366c46b36997afab97c8a712758b07dc7f9fce0b3e20b8280d41539f02d70ee5c7e16188d8f6db9731fb6881
)
+prepare() {
+ cd $srcdir/${pkgbase^}-$pkgver
+ patch -Np1 -i ../llvm35.patch
+}
+
build() {
cd $srcdir/${pkgbase^}-$pkgver
export CC="gcc -m32"
diff --git a/libre-multilib/lib32-mesa-libcl/llvm35.patch b/libre-multilib/lib32-mesa-libcl/llvm35.patch
new file mode 100644
index 000000000..b8dc6fe26
--- /dev/null
+++ b/libre-multilib/lib32-mesa-libcl/llvm35.patch
@@ -0,0 +1,26 @@
+From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
+From: Aaron Watry <awatry@gmail.com>
+Date: Fri, 20 Jun 2014 19:13:30 -0500
+Subject: gallivm: Fix build after LLVM commit 211259
+
+Signed-off-by: Aaron Watry <awatry@gmail.com>
+Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index df26883..413a0c2 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -51,7 +51,9 @@
+ #include <llvm/MC/MCInstPrinter.h>
+ #include <llvm/MC/MCRegisterInfo.h>
+
+-#if HAVE_LLVM >= 0x0303
++#if HAVE_LLVM >= 0x0305
++#define OwningPtr std::unique_ptr
++#elif HAVE_LLVM >= 0x0303
+ #include <llvm/ADT/OwningPtr.h>
+ #endif
+
+--
+cgit v0.10.2
+