[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, 2.27.57/master, updated. debian/unison2.27.57-2.27.57-3-5-g689ba7b

[Stephane Glondu]

The following commit has been merged in the 2.27.57/master branch:
commit 5b680218d303a76c34e293cbe1cfbf66dcf82064
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 9 21:17:06 2011 +0200

    Fix build with ld --as-needed (Closes: #633354)

diff --git a/debian/patches/0006-Fix-build-with-ld-as-needed.patch b/debian/patches/0006-Fix-build-with-ld-as-needed.patch
new file mode 100644
index 0000000..14b5c64
--- /dev/null
+++ b/debian/patches/0006-Fix-build-with-ld-as-needed.patch
@@ -0,0 +1,30 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Sat, 9 Jul 2011 21:13:35 +0200
+Subject: Fix build with ld --as-needed
+
+When building with ld --as-needed the libraries must be placed after
+the objects needing their symbols. Else the library is not registered
+as needed and dropped leading to undefined references.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/unison2.27.57/+bug/803210
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633354
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile.OCaml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 0a1127e..8e6d836 100644
+--- a/Makefile.OCaml
++++ b/Makefile.OCaml
+@@ -349,7 +349,7 @@ win32rc/unison.res.lib: win32rc/unison.res
+ 
+ $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
+ 	@echo Linking $@
+-	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
++	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
+ 
+ # Unfortunately -output-obj does not put .o files into the output, only .cmx
+ # files, so we have to use $(LD) to take care of COBJS.
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index e3861d7..df58182 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-typo-missing-o-in-follow.patch
 0004-Fix-silent-behaviour.patch
 0005-Fix-build-with-OCaml-3.12.patch
+0006-Fix-build-with-ld-as-needed.patch

-- 
unison packaging