rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 288561 from home:namtrac:llvm-3.6

Browse Source 
- Add u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch to
  fix build with llvm 3.6 (fdo#86958)

OBS-URL: https://build.opensuse.org/request/show/288561
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=432
This commit is contained in:
Stefan Dirsch 2015-03-03 10:32:49 +00:00 committed by Git OBS Bridge
parent 47259b11b8
commit 849e258d73
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesa.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 2 19:27:19 UTC 2015 - idonmez@suse.com
- Add u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch to
fix build with llvm 3.6 (fdo#86958)
-------------------------------------------------------------------
Tue Feb 24 16:08:49 UTC 2015 - tobias.johannes.klausmann@mni.thm.de

3
Mesa.spec
View File

@ -54,6 +54,8 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
# Fix build with llvm 3.6 fdo#86958
Patch16: u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: bison
@ -514,6 +516,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch15 -p1
#%patch13 -p1
###
%patch16 -p1
%build
%if 0%{?suse_version} >= 1310

29
u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch Normal file
View File

@ -0,0 +1,29 @@
From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Wed, 3 Dec 2014 07:48:26 +0000
Subject: gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.
Trivial.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index fe3c754..5210acc 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -500,8 +500,12 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
MM = new ShaderMemoryManager(JMM);
*OutCode = MM->getGeneratedCode();
+#if HAVE_LLVM >= 0x0306
+ builder.setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>(MM));
+#else
builder.setMCJITMemoryManager(MM);
#endif
+#endif
} else {
#if HAVE_LLVM < 0x0306
BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);
--
cgit v0.10.2