[Pkg-ocaml-maint-commits] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.0.1-3-4-gbc956e6

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c900ac56c609f33c318df721df98a9497aa50e4a
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Dec 3 23:19:51 2010 +0100

    Add 0003-Change-position-of-flag-lpcre.patch

diff --git a/debian/patches/0003-Change-position-of-flag-lpcre.patch b/debian/patches/0003-Change-position-of-flag-lpcre.patch
new file mode 100644
index 0000000..05710cb
--- /dev/null
+++ b/debian/patches/0003-Change-position-of-flag-lpcre.patch
@@ -0,0 +1,54 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 3 Dec 2010 23:18:19 +0100
+Subject: [PATCH] Change position of flag -lpcre
+
+This fixes FTBFS of reverse dependencies when --as-needed is on by
+default (in Ubuntu since natty).
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ OCamlMakefile |    9 +--------
+ lib/Makefile  |    2 +-
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/OCamlMakefile b/OCamlMakefile
+index d1060eb..a558021 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -62,6 +62,7 @@ export OCAML_DEFAULT_DIRS
+ 
+ export LIBS
+ export CLIBS
++export CLIBS_OPTS
+ export CFRAMEWORKS
+ 
+ export OCAMLFLAGS
+@@ -597,14 +598,6 @@ else
+ 		    $(OCAML_DEFAULT_DIRS:%=-LIBPATH:%) "
+ endif
+ 
+-CLIBS_OPTS := $(CLIBS:%=-cclib -l%) $(CFRAMEWORKS:%=-cclib '-framework %')
+-ifdef MSVC
+-  ifndef STATIC
+-  # MSVC libraries do not have 'lib' prefix
+-  CLIBS_OPTS := $(CLIBS:%=-cclib %.lib)
+-  endif
+-endif
+-
+ ifneq ($(strip $(OBJ_LINK)),)
+   ifdef CREATE_LIB
+     OBJS_LIBS := -cclib -l$(CLIB_BASE) $(CLIBS_OPTS) $(MAYBE_IDL)
+diff --git a/lib/Makefile b/lib/Makefile
+index 96c23fa..aa0edbb 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -3,7 +3,7 @@ OCAMLMAKEFILE = ../OCamlMakefile
+ SOURCES := pcre.mli pcre.ml pcre_stubs.c
+ CFLAGS := -O2 $(shell pcre-config --cflags)
+ PCRE_FLAGS := $(shell pcre-config --libs)
+-OCAMLLDFLAGS := -cclib "$(PCRE_FLAGS)"
++CLIBS_OPTS := -cclib "$(PCRE_FLAGS)"
+ OCAMLMKLIB_FLAGS := $(PCRE_FLAGS)
+ RESULT := pcre
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index fff5e9e..d872021 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-enable-byte-only-build.patch
 0002-build-PIC-shared-objects.patch
+0003-Change-position-of-flag-lpcre.patch

-- 
pcre-ocaml packaging