[Pkg-haskell-commits] darcs: haskell-llvm: Link against LLVM shared libs

[laney at debian.org]

Fri Jun  3 07:50:04 UTC 2011  laney at debian.org
  * Link against LLVM shared libs
  Ignore-this: 8b58120ccf957b05ae514d5072fc5e1

    M ./changelog +2
    A ./patches/01-shared-llvm.diff
    M ./patches/series +1

Fri Jun  3 07:50:04 UTC 2011  laney at debian.org
  * Link against LLVM shared libs
  Ignore-this: 8b58120ccf957b05ae514d5072fc5e1
diff -rN -u old-haskell-llvm//changelog new-haskell-llvm//changelog
--- old-haskell-llvm//changelog	2011-06-03 08:56:44.276318230 +0000
+++ new-haskell-llvm//changelog	2011-06-03 08:56:44.296303006 +0000
@@ -2,6 +2,8 @@
 
   * Rename libghc6-llvm-doc.examples to libghc-llvm-doc.examples to actually
     install the examples 
+  * 01-shared-llvm.diff: Add patch taken from Ubuntu to link against LLVM's
+    shared libraries (Closes: #597836) 
 
  -- Iain Lane <laney at debian.org>  Thu, 02 Jun 2011 23:33:05 +0100
 
diff -rN -u old-haskell-llvm//patches/01-shared-llvm.diff new-haskell-llvm//patches/01-shared-llvm.diff
--- old-haskell-llvm//patches/01-shared-llvm.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-llvm//patches/01-shared-llvm.diff	2011-06-03 08:56:44.280279943 +0000
@@ -0,0 +1,30 @@
+Description: link with the shared LLVM-2.8 library
+Author: Matthias Klose <doko at ubuntu.com>
+Forwarded: yes, https://github.com/bos/llvm/pull/1
+
+Index: haskell-llvm-0.8.0.2/configure
+===================================================================
+--- haskell-llvm-0.8.0.2.orig/configure	2011-01-30 13:05:53.000000000 +0100
++++ haskell-llvm-0.8.0.2/configure	2011-01-30 13:13:11.000000000 +0100
+@@ -2528,7 +2528,7 @@
+ llvm_includedir="`$llvm_config --includedir`"
+ llvm_ldflags="`$llvm_config --ldflags`"
+ 
+-llvm_all_libs="`$llvm_config --libs all`"
++llvm_all_libs="-lLLVM-2.8"
+ llvm_target="`$llvm_config --libs engine | sed 's/.*LLVM\(.[^ ]*\)CodeGen.*/\1/'`"
+ 
+ CPPFLAGS="$llvm_cppflags $CPPFLAGS $TARGET_CPPFLAGS"
+Index: haskell-llvm-0.8.0.2/configure.ac
+===================================================================
+--- haskell-llvm-0.8.0.2.orig/configure.ac	2011-01-30 13:13:39.000000000 +0100
++++ haskell-llvm-0.8.0.2/configure.ac	2011-01-30 13:13:59.000000000 +0100
+@@ -72,7 +72,7 @@
+ llvm_includedir="`$llvm_config --includedir`"
+ llvm_ldflags="`$llvm_config --ldflags`"
+ 
+-llvm_all_libs="`$llvm_config --libs all`"
++llvm_all_libs="-lLLVM-2.8"
+ llvm_target="`$llvm_config --libs engine | sed 's/.*LLVM\(.[[^ ]]*\)CodeGen.*/\1/'`"
+ 
+ CPPFLAGS="$llvm_cppflags $CPPFLAGS $TARGET_CPPFLAGS"
diff -rN -u old-haskell-llvm//patches/series new-haskell-llvm//patches/series
--- old-haskell-llvm//patches/series	2011-06-03 08:56:44.276318230 +0000
+++ new-haskell-llvm//patches/series	2011-06-03 08:56:44.292306183 +0000
@@ -1 +1,2 @@
 00-versioned-config.diff
+01-shared-llvm.diff