[SCM] Maintenance of the freemat package branch, master, updated. debian/4.0-1-7-g983f793

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 311800de19834ad5d23ec1cbcf244f6d6c12b4a4
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Wed Dec 9 15:43:48 2009 +0100

    Force llvm version to 2.6

diff --git a/debian/patches/10_llvm.patch b/debian/patches/10_llvm.patch
new file mode 100644
index 0000000..0acc79e
--- /dev/null
+++ b/debian/patches/10_llvm.patch
@@ -0,0 +1,32 @@
+Force llvm version to 2.6
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -281,7 +281,7 @@ IF( USE_LLVM )
+ 		  ${LIB_LLVMScalarOpts} ${LIB_LLVMTransformUtils} ${LIB_LLVMipa} ${LIB_LLVMAnalysis} 
+ 		  ${LIB_LLVMTarget} ${LIB_LLVMCore} ${LIB_LLVMSupport} ${LIB_LLVMSystem} 
+ 		  CACHE STRING "LLVM Link Libraries" )
+-	set(LLVM_VERSION "2.5" CACHE STRING "LLVM Version found")
++	set(LLVM_VERSION "2.6" CACHE STRING "LLVM Version found")
+     endif (LLVM_INCLUDE_DIR)
+   else (MSVC)
+     find_program(LLVM_CONFIG llvm-config)
+@@ -291,15 +291,15 @@ IF( USE_LLVM )
+     execute_process(COMMAND ${LLVM_CONFIG} --version OUTPUT_VARIABLE LLVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+     separate_arguments(LLVM_LIBS) 
+   endif (MSVC)
+-  if (NOT LLVM_VERSION STREQUAL "2.5")
+-    message(FATAL_ERROR "LLVM version 2.5 required.")
++  if (NOT LLVM_VERSION STREQUAL "2.6")
++    message(FATAL_ERROR "LLVM version 2.6 required.")
+     set(USE_LLVM FALSE)
+-  else (NOT LLVM_VERSION STREQUAL "2.5") 
++  else (NOT LLVM_VERSION STREQUAL "2.6") 
+     set(LLVM_FOUND TRUE)
+     include_directories( ${LLVM_INCLUDE_DIR} )
+     add_definitions( -DHAVE_LLVM )
+     SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${LLVM_LIBS})
+-  endif (NOT LLVM_VERSION STREQUAL "2.5")
++  endif (NOT LLVM_VERSION STREQUAL "2.6")
+ ENDIF (USE_LLVM)
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3561f67..3d24f4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_gcc_includes.patch
 07_fix_FTBFS_with_GCC_4.4.patch
 09_warning.patch
+10_llvm.patch

-- 
Maintenance of the freemat package