Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (dc8c799ae691ddff9f96ca51aa5016b8703b1625)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (dc8c799ae691ddff9f96ca51aa5016b8703b1625)
  • Date: Sat, 2 Jun 2012 21:39:30 -0500

GIT changes to devel-xorg-modular grimoire by Robin Cook <rcook AT wyrms.net>:

graphics-libs/mesalib/HISTORY | 4 +
graphics-libs/mesalib/PRE_BUILD | 3 +
graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch | 53
++++++++++++++++++++++++
3 files changed, 60 insertions(+)

New commits:
commit dc8c799ae691ddff9f96ca51aa5016b8703b1625
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

mesalib: added patch to build development version with llvm 3.1

diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 49683b1..cf5881d 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2012-06-02 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added patch for development version to build with llmv
3.1
+ https://bugs.gentoo.org/show_bug.cgi?id=417363
+
2012-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 8.0.3 (development)

diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index eb1d2b9..f224457 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -30,6 +30,9 @@ if [[ "$MESALIB_BRANCH" != "development" ]]; then
sedit "s:/X11R6::g" Makefile.template
cd ${SOURCE_DIRECTORY}/src/glw &&
sedit "s:/X11R6::g" Makefile
+else
+ cd $SOURCE_DIRECTORY &&
+ patch -p0 < $SPELL_DIRECTORY/mesa-8.0.3-llvm-3.1.patch
fi &&

if [[ "$MESALIB_BRANCH" == "scm" ]]; then
diff --git a/graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch
b/graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch
new file mode 100644
index 0000000..8df86c8
--- /dev/null
+++ b/graphics-libs/mesalib/mesa-8.0.3-llvm-3.1.patch
@@ -0,0 +1,53 @@
+--- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp 2012-03-21
11:54:27.000000000 -0400
++++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp.mod 2012-05-25
22:13:11.808747221 -0400
+@@ -54,6 +54,10 @@
+ #include <llvm/MC/MCInstPrinter.h>
+ #endif /* HAVE_LLVM >= 0x0207 */
+
++#if HAVE_LLVM >= 0x0301
++#include <llvm/MC/MCRegisterInfo.h>
++#endif /* HAVE_LLVM >= 0x0301 */
++
+ #include "util/u_math.h"
+ #include "util/u_debug.h"
+
+@@ -235,7 +239,23 @@ lp_disassemble(const void* func)
+ int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
+ #endif
+
+-#if HAVE_LLVM >= 0x0300
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
++ if (!MRI) {
++ debug_printf("error: no register info for target %s\n",
Triple.c_str());
++ return;
++ }
++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
++ if (!MII) {
++ debug_printf("error: no instruction info for target %s\n",
Triple.c_str());
++ return;
++ }
++#endif
++
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<MCInstPrinter> Printer(
++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII,
*MRI, *STI));
++#elif HAVE_LLVM >= 0x0300
+ OwningPtr<MCInstPrinter> Printer(
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
+ #elif HAVE_LLVM >= 0x0208
+
+--- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 2012-03-21
11:54:27.000000000 -0400
++++ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp.mod 2012-05-25
22:08:02.150281687 -0400
+@@ -62,7 +62,11 @@
+ extern "C" void
+ lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
+ {
+-
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
++ #if HAVE_LLVM >= 0x0301
++
llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
++ #else
++
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
++ #endif
+ }
+



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (dc8c799ae691ddff9f96ca51aa5016b8703b1625), Robin Cook, 06/02/2012

Archive powered by MHonArc 2.6.24.

Top of Page