Title: [176255] trunk/Tools
- Revision
- 176255
- Author
- changseok...@collabora.com
- Date
- 2014-11-18 05:40:49 -0800 (Tue, 18 Nov 2014)
Log Message
[GTK] Mesa build fails over llvm-3.5
https://bugs.webkit.org/show_bug.cgi?id=138825
Reviewed by Gustavo Noronha Silva.
OwningPtr.h have been removed in llvm-3.5. Instread we should use std::unique_ptr for mesa build.
* gtk/jhbuild.modules:
* gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (176254 => 176255)
--- trunk/Tools/ChangeLog 2014-11-18 12:51:59 UTC (rev 176254)
+++ trunk/Tools/ChangeLog 2014-11-18 13:40:49 UTC (rev 176255)
@@ -1,3 +1,15 @@
+2014-11-18 ChangSeok Oh <changseok...@collabora.com>
+
+ [GTK] Mesa build fails over llvm-3.5
+ https://bugs.webkit.org/show_bug.cgi?id=138825
+
+ Reviewed by Gustavo Noronha Silva.
+
+ OwningPtr.h have been removed in llvm-3.5. Instread we should use std::unique_ptr for mesa build.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch: Added.
+
2014-11-17 Daniel Bates <daba...@apple.com>
Unreviewed, rolling out r176232.
Modified: trunk/Tools/gtk/jhbuild.modules (176254 => 176255)
--- trunk/Tools/gtk/jhbuild.modules 2014-11-18 12:51:59 UTC (rev 176254)
+++ trunk/Tools/gtk/jhbuild.modules 2014-11-18 13:40:49 UTC (rev 176255)
@@ -355,7 +355,9 @@
<branch module="/pub/mesa/10.2.1/MesaLib-10.2.1.tar.bz2" version="10.2.1"
checkoutdir="Mesa"
repo="ftp.freedesktop.org"
- hash="sha256:461277909207da689d8152cfbf9e182ea6f70e1e672ab64c67df83725c8d2b54"/>
+ hash="sha256:461277909207da689d8152cfbf9e182ea6f70e1e672ab64c67df83725c8d2b54">
+ <patch file="mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch" strip="1"/>
+ </branch>
</autotools>
</moduleset>
Added: trunk/Tools/gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch (0 => 176255)
--- trunk/Tools/gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch (rev 0)
+++ trunk/Tools/gtk/patches/mesa-gallivm-Fix-build-after-LLVM-commit-211259.patch 2014-11-18 13:40:49 UTC (rev 176255)
@@ -0,0 +1,29 @@
+From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
+From: Aaron Watry <awa...@gmail.com>
+Date: Fri, 20 Jun 2014 19:13:30 -0500
+Subject: [PATCH] gallivm: Fix build after LLVM commit 211259
+
+Signed-off-by: Aaron Watry <awa...@gmail.com>
+Reviewed-by: Tom Stellard <thomas.stell...@amd.com>
+---
+ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+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
+
+--
+2.1.0
+
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
