From d97cc4e98e4783244cc9f4bbc75527cf39e4e04b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 1 Mar 2015 18:44:57 +0100 Subject: [PATCH] Mesa: add patch to fix build with llvm-3.6 support Signed-off-by: Stephan Raue --- .../patches/Mesa-fix-llvm-3.6-build.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/graphics/Mesa/patches/Mesa-fix-llvm-3.6-build.patch diff --git a/packages/graphics/Mesa/patches/Mesa-fix-llvm-3.6-build.patch b/packages/graphics/Mesa/patches/Mesa-fix-llvm-3.6-build.patch new file mode 100644 index 0000000000..d0747e9a50 --- /dev/null +++ b/packages/graphics/Mesa/patches/Mesa-fix-llvm-3.6-build.patch @@ -0,0 +1,29 @@ +From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= +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(MM)); ++#else + builder.setMCJITMemoryManager(MM); + #endif ++#endif + } else { + #if HAVE_LLVM < 0x0306 + BaseMemoryManager* JMM = reinterpret_cast(CMM); +-- +cgit v0.10.2 +