[Pkg-haskell-commits] darcs: helium: * Merge from Ubuntu (Michael Bienia):

[Colin Watson]

Tue May 28 23:16:34 UTC 2013  Colin Watson <cjwatson at debian.org>
  * * Merge from Ubuntu (Michael Bienia):
  Ignore-this: 728dc64d6137c28cb15f055a0cc2c2d1
    - debian/patches/20_fix-as-needed-linking: Fix linking with --as-needed.

    M ./changelog +2
    A ./patches/20_fix-as-needed-linking
    M ./patches/series +1

Tue May 28 23:16:34 UTC 2013  Colin Watson <cjwatson at debian.org>
  * * Merge from Ubuntu (Michael Bienia):
  Ignore-this: 728dc64d6137c28cb15f055a0cc2c2d1
    - debian/patches/20_fix-as-needed-linking: Fix linking with --as-needed.
diff -rN -u old-helium//changelog new-helium//changelog
--- old-helium//changelog	2013-05-28 23:16:44.853538154 +0000
+++ new-helium//changelog	2013-05-28 23:16:44.857545168 +0000
@@ -2,6 +2,8 @@
 
   * Restore changes from NMU (Luk Claes):
     - Add libncurses-dev build dependency.
+  * Merge from Ubuntu (Michael Bienia):
+    - debian/patches/20_fix-as-needed-linking: Fix linking with --as-needed.
 
  -- Colin Watson <cjwatson at debian.org>  Wed, 29 May 2013 00:12:26 +0100
 
diff -rN -u old-helium//patches/20_fix-as-needed-linking new-helium//patches/20_fix-as-needed-linking
--- old-helium//patches/20_fix-as-needed-linking	1970-01-01 00:00:00.000000000 +0000
+++ new-helium//patches/20_fix-as-needed-linking	2013-05-28 23:16:44.865544070 +0000
@@ -0,0 +1,16 @@
+A better fix would be to split libs from LINKOPT but as it contains only
+libs in this case, moving all of it to the end of the linker call works
+too.
+Index: helium-1.6/lvm/src/runtime/makefile
+===================================================================
+--- helium-1.6.orig/lvm/src/runtime/makefile	2010-12-03 17:48:46.000000000 +0100
++++ helium-1.6/lvm/src/runtime/makefile	2010-12-03 17:49:07.000000000 +0100
+@@ -50,7 +50,7 @@
+ #	$(LINK) -o $@ $(LINKOPT) $(OBJS) -g
+ 
+ lvmrun$(EXE): $(OBJS)
+-	$(LINK) -o $@ $(LINKOPT) $(OBJS)
++	$(LINK) -o $@ $(OBJS) $(LINKOPT)
+ #	$(STRIP) $@
+ 
+ core/evaluator.o: core/evaluator.c
diff -rN -u old-helium//patches/series new-helium//patches/series
--- old-helium//patches/series	2013-05-28 23:16:44.853538154 +0000
+++ new-helium//patches/series	2013-05-28 23:16:44.873545348 +0000
@@ -9,3 +9,4 @@
 use-sinclude
 parsec3-compat
 ghc-7.4-compat
+20_fix-as-needed-linking