public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-mathematics/freemat/files: freemat-4.2-use_llvm.patch
@ 2014-12-06 21:05 Matthias Maier (tamiko)
  0 siblings, 0 replies; only message in thread
From: Matthias Maier (tamiko) @ 2014-12-06 21:05 UTC (permalink / raw
  To: gentoo-commits

tamiko      14/12/06 21:05:59

  Added:                freemat-4.2-use_llvm.patch
  Log:
  drop python-r1 eclass; fix dependencies; fix llvm configuration wrt bug #531316
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)

Revision  Changes    Path
1.1                  sci-mathematics/freemat/files/freemat-4.2-use_llvm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.2-use_llvm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.2-use_llvm.patch?rev=1.1&content-type=text/plain

Index: freemat-4.2-use_llvm.patch
===================================================================
--- libs/libMatC/CMakeLists.txt.orig	2011-11-27 01:27:43.000000000 +0100
+++ libs/libMatC/CMakeLists.txt		2012-01-29 14:39:19.842402326 +0100
@@ -1,10 +1,14 @@
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} )
 
+IF( USE_LLVM )
+  set(LLVM_SOURCES "CJitFuncClang.cpp")
+endif( USE_LLVM )
+
 ADD_LIBRARY( MatC 
 	JITFactory.cpp
 	CJitFunc.cpp
-	CJitFuncClang.cpp
+	${LLVM_SOURCES}
 	CArray.cpp
 )
 
--- libs/libMatC.orig/JITFactory.cpp	2011-11-27 01:27:43.000000000 +0100
+++ libs/libMatC/JITFactory.cpp		2012-01-29 14:53:17.296686846 +0100
@@ -1,5 +1,7 @@
 #include "JITFactory.hpp"
-#include "CJitFuncClang.hpp"
+#ifdef HAVE_LLVM
+# include "CJitFuncClang.hpp"
+#endif
 
 JITFuncBase* JITFactory::GetJITFunc(Interpreter *eval)
 {
--- CMakeLists.txt	2014-12-06 21:47:39.685839650 +0100
+++ CMakeLists.txt	2014-12-06 21:48:01.752127927 +0100
@@ -249,9 +249,10 @@
 # LLVM Support
 ######################################################################
 OPTION(USE_LLVM "Build with LLVM support?" ON)
-
-FIND_PACKAGE(LLVM)
-FIND_PACKAGE(CLANG)
+IF(USE_LLVM)
+  FIND_PACKAGE(LLVM)
+  FIND_PACKAGE(CLANG)
+ENDIF()
 
 IF (LLVM_FOUND AND CLANG_FOUND)
   add_definitions(-DHAVE_LLVM)





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-12-06 21:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-06 21:05 [gentoo-commits] gentoo-x86 commit in sci-mathematics/freemat/files: freemat-4.2-use_llvm.patch Matthias Maier (tamiko)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox