[Pkg-ocaml-maint-commits] [SCM] cudf packaging branch, master, updated. debian/0.5.99-1-6-g60810b0

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 24cc5d376964c4d1277e8ce363234c665dd9c288
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Fri May 6 21:15:37 2011 +0200

    add patch link-caml_hash_variant-with-ldl.patch to fix link failure
    
    fix link failure with recent binutils (and on non-Linux systems).
    Thanks Cyril Brulebois for the patch!
    
    Closes: #602489

diff --git a/debian/changelog b/debian/changelog
index af31164..de3fb3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ cudf (0.5.99-2) UNRELEASED; urgency=low
 
   [ Stefano Zacchiroli ]
   * debian/control: bump Standards-Version to 3.9.2 (no changes needed)
+  * debian/patches/
+    - add patch link-caml_hash_variant-with-ldl.patch to avoid link
+      failure with recent binutils (and on non-Linux systems). Thanks
+      Cyril Brulebois for the patch! (Closes: #602489)
 
  -- Stefano Zacchiroli <zack at debian.org>  Fri, 06 May 2011 18:03:48 +0200
 
diff --git a/debian/patches/link-caml_hash_variant-with-ldl.patch b/debian/patches/link-caml_hash_variant-with-ldl.patch
new file mode 100644
index 0000000..1f36176
--- /dev/null
+++ b/debian/patches/link-caml_hash_variant-with-ldl.patch
@@ -0,0 +1,33 @@
+Description: link caml_hash_variant with -ldl
+ without that, one can run into the following issues, on non-Linux systems:
+   cc -Wall -DG_LOG_DOMAIN=\"libCUDF\" -o caml_hash_variant caml_hash_variant.o dummy.o -L/usr/lib/ocaml -lcamlrun -lm -lcurses
+   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlerror':
+   (.text+0x16c): undefined reference to `dlerror'
+   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlsym':
+   (.text+0x17a): undefined reference to `dlsym'
+   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlclose':
+   (.text+0x19e): undefined reference to `dlclose'
+   /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlopen':
+   (.text+0x1bb): undefined reference to `dlopen'
+   collect2: ld returned 1 exit status
+Author: Cyril Brulebois <kibi at debian.org>
+Last-Update: 2010-11-05
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602489
+---
+ c-lib/Makefile.variants |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/c-lib/Makefile.variants b/c-lib/Makefile.variants
+index 19af0ea..fdf2655 100644
+--- a/c-lib/Makefile.variants
++++ b/c-lib/Makefile.variants
+@@ -65,7 +65,7 @@ cudf-variants.h: caml_hash_variant Makefile.variants
+ caml_hash_variant: caml_hash_variant.o
+ 	> dummy.ml
+ 	ocamlc -o dummy.o -output-obj dummy.ml
+-	$(CC) $(CFLAGS) -o $@ $< dummy.o -L$(OCAML_LIBDIR) -lcamlrun -lm -lcurses
++	$(CC) $(CFLAGS) -o $@ $< dummy.o -L$(OCAML_LIBDIR) -lcamlrun -lm -lcurses -ldl
+ 	@rm -f dummy.*
+ 
+ clean: clean-variants
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8e6c57d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+link-caml_hash_variant-with-ldl.patch

-- 
cudf packaging