[Pkg-haskell-commits] darcs: haskell-llvm: shared libraries (Closes: #597836). Thanks to Matthias Klose.

[laney at debian.org]

Fri Jun  3 08:08:54 UTC 2011  laney at debian.org
  * shared libraries (Closes: #597836). Thanks to Matthias Klose.
  Ignore-this: ef7527f44119231d4bbaa197d610ec8a
  * 02-fix-linking-ld-no-add-needed.diff: Add patch taken from Ubuntu to build with ld --no-add-needed. Thanks to Michael Bienia.

    M ./changelog -2 +4
    A ./patches/02-fix-linking-ld-no-add-needed.diff
    M ./patches/series +1

Fri Jun  3 08:08:54 UTC 2011  laney at debian.org
  * shared libraries (Closes: #597836). Thanks to Matthias Klose.
  Ignore-this: ef7527f44119231d4bbaa197d610ec8a
  * 02-fix-linking-ld-no-add-needed.diff: Add patch taken from Ubuntu to build with ld --no-add-needed. Thanks to Michael Bienia.
diff -rN -u old-haskell-llvm//changelog new-haskell-llvm//changelog
--- old-haskell-llvm//changelog	2011-06-03 08:56:44.492302272 +0000
+++ new-haskell-llvm//changelog	2011-06-03 08:56:44.508281494 +0000
@@ -3,9 +3,11 @@
   * 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) 
+    shared libraries (Closes: #597836). Thanks to Matthias Klose.
+  * 02-fix-linking-ld-no-add-needed.diff: Add patch taken from Ubuntu to build
+    with ld --no-add-needed. Thanks to Michael Bienia.
 
- -- Iain Lane <laney at debian.org>  Thu, 02 Jun 2011 23:33:05 +0100
+ -- Iain Lane <laney at debian.org>  Fri, 03 Jun 2011 08:52:57 +0100
 
 haskell-llvm (0.8.0.2-3) unstable; urgency=low
 
diff -rN -u old-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff new-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff
--- old-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-llvm//patches/02-fix-linking-ld-no-add-needed.diff	2011-06-03 08:56:44.504277590 +0000
@@ -0,0 +1,30 @@
+Description: Build with ld --as-needed
+Author: Matthias Klose <doko at ubuntu.com>
+Forwarded: yes, https://github.com/bos/llvm/pull/1
+
+Index: haskell-llvm/configure
+===================================================================
+--- haskell-llvm.orig/configure	2011-05-28 09:39:00.248596000 +0100
++++ haskell-llvm/configure	2011-05-28 09:39:45.202435000 +0100
+@@ -3996,7 +3996,7 @@
+ done
+ 
+ 
+-LIBS="-lLLVMSupport -lLLVMSystem $LIBS"
++LIBS="-lLLVMSupport -lLLVMSystem -lpthread -ldl $LIBS"
+ 
+ # We have to link using the C++ compiler.
+ CC=$CXX
+Index: haskell-llvm/configure.ac
+===================================================================
+--- haskell-llvm.orig/configure.ac	2011-05-28 09:39:00.248596000 +0100
++++ haskell-llvm/configure.ac	2011-05-28 09:39:00.248596000 +0100
+@@ -81,7 +81,7 @@
+ AC_CHECK_HEADERS([llvm-c/Core.h], [],
+   [AC_MSG_ERROR(could not find LLVM C bindings)])
+ 
+-LIBS="-lLLVMSupport -lLLVMSystem $LIBS"
++LIBS="-lLLVMSupport -lLLVMSystem -lpthread -ldl $LIBS"
+ 
+ # We have to link using the C++ compiler.
+ CC=$CXX
diff -rN -u old-haskell-llvm//patches/series new-haskell-llvm//patches/series
--- old-haskell-llvm//patches/series	2011-06-03 08:56:44.492302272 +0000
+++ new-haskell-llvm//patches/series	2011-06-03 08:56:44.504277590 +0000
@@ -1,2 +1,3 @@
 00-versioned-config.diff
 01-shared-llvm.diff
+02-fix-linking-ld-no-add-needed.diff