changeset 3114:0919be00603c

Include LLVM as a dependency of Octave
author John W. Eaton <jwe@octave.org>
date Wed, 02 Jan 2013 20:21:08 -0500
parents 0adbff7dec24
children 90f9826eb4d6
files src/llvm-1-fixes.patch src/octave.mk
diffstat 2 files changed, 30 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/src/llvm-1-fixes.patch
@@ -0,0 +1,29 @@
+diff -uNr a/lib/ExecutionEngine/JIT/CMakeLists.txt b/lib/ExecutionEngine/JIT/CMakeLists.txt
+--- a/lib/ExecutionEngine/JIT/CMakeLists.txt	2011-07-28 20:14:25.000000000 -0400
++++ b/lib/ExecutionEngine/JIT/CMakeLists.txt	2012-12-27 15:31:36.302394951 -0500
+@@ -12,6 +12,7 @@
+   )
+ 
+ add_llvm_library_dependencies(LLVMJIT
++  LLVMCodeGen
+   LLVMCore
+   LLVMExecutionEngine
+   LLVMRuntimeDyld
+diff -uNr a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt
+--- a/utils/unittest/CMakeLists.txt	2011-07-27 06:19:32.000000000 -0400
++++ b/utils/unittest/CMakeLists.txt	2012-12-27 15:57:13.797820822 -0500
+@@ -37,6 +37,14 @@
+   googletest/gtest-typed-test.cc
+   )
+ 
++add_llvm_library_dependencies(gtest
++  LLVMSupport
++  )
++
+ add_llvm_library(gtest_main
+   UnitTestMain/TestMain.cpp
+   )
++
++add_llvm_library_dependencies(gtest_main
++  gtest
++  )
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack pcre qhull qrupdate readline suitesparse zlib
+$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack llvm pcre qhull qrupdate readline suitesparse zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;