diff options
Diffstat (limited to 'media-libs/mesa/files/0002-gallivm-Workaround-LLVM-PR23628.patch')
| -rw-r--r-- | media-libs/mesa/files/0002-gallivm-Workaround-LLVM-PR23628.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/media-libs/mesa/files/0002-gallivm-Workaround-LLVM-PR23628.patch b/media-libs/mesa/files/0002-gallivm-Workaround-LLVM-PR23628.patch new file mode 100644 index 0000000..3dc2c81 --- /dev/null +++ b/media-libs/mesa/files/0002-gallivm-Workaround-LLVM-PR23628.patch @@ -0,0 +1,48 @@ +From 025db80a8deb2358638a18d6c777721e288fdca8 Mon Sep 17 00:00:00 2001 +From: Jose Fonseca <jfonseca@vmware.com> +Date: Thu, 28 May 2015 10:11:36 +0100 +Subject: [PATCH 2/2] gallivm: Workaround LLVM PR23628. + +Temporarily undefine DEBUG macro while including LLVM C++ headers, +leveraging the push/pop_macro pragmas, which are supported both by GCC +and MSVC. + +https://bugs.freedesktop.org/show_bug.cgi?id=90621 + +Trivial. +--- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index ffed9e6..5e25819 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -50,6 +50,12 @@ + + #include <stddef.h> + ++// Workaround http://llvm.org/PR23628 ++#if HAVE_LLVM >= 0x0307 ++# pragma push_macro("DEBUG") ++# undef DEBUG ++#endif ++ + #include <llvm-c/Core.h> + #include <llvm-c/ExecutionEngine.h> + #include <llvm/Target/TargetOptions.h> +@@ -70,6 +76,11 @@ + #include <llvm/IR/Module.h> + #include <llvm/Support/CBindingWrapping.h> + ++// Workaround http://llvm.org/PR23628 ++#if HAVE_LLVM >= 0x0307 ++# pragma pop_macro("DEBUG") ++#endif ++ + #include "pipe/p_config.h" + #include "util/u_debug.h" + #include "util/u_cpu_detect.h" +-- +2.4.0 + |