[Pkg-ocaml-maint-commits] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.4-1-2-g0238354

[Stephane Glondu]

The following commit has been merged in the master branch:
commit eba20647d665a2b82cc8401e2fead7c1c32d18e8
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jan 2 13:59:04 2012 +0100

    Dirty hack to fix link options

diff --git a/debian/patches/0005-Temporary-fix.patch b/debian/patches/0005-Temporary-fix.patch
new file mode 100644
index 0000000..6d77f88
--- /dev/null
+++ b/debian/patches/0005-Temporary-fix.patch
@@ -0,0 +1,63 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 2 Jan 2012 14:05:36 +0100
+Subject: Temporary fix
+
+In debug targets, overriding OCAMLLDFLAGS in recursive calls to make
+cause the -lpcre option to be forgotten somehow. I haven't figured out
+why yet. This causes (some) reverse dependencies to FTBFS, so here is
+a dirty hack to "fix" it.
+---
+ OCamlMakefile |   14 ++++++--------
+ 1 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/OCamlMakefile b/OCamlMakefile
+index b10cf68..4038a4d 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -862,8 +862,7 @@ debug-code-library:	$(PRE_TARGETS)
+ 				$(RES_CLIB) $(BCRESULT).cma \
+ 				REAL_RESULT="$(BCRESULT)" make_deps=yes \
+ 				CREATE_LIB=yes \
+-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
+-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
++				OCAMLFLAGS="-g $(OCAMLFLAGS)"
+ dcl:	debug-code-library
+ 
+ # generates byte-code libraries with debugging information (native code)
+@@ -873,8 +872,7 @@ debug-native-code-library:	$(PRE_TARGETS)
+ 				REAL_RESULT="$(NCRESULT)" make_deps=yes \
+ 				REAL_OCAMLC="$(OCAMLOPT)" \
+ 				CREATE_LIB=yes \
+-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
+-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
++				OCAMLFLAGS="-g $(OCAMLFLAGS)"
+ dncl:	debug-native-code-library
+ 
+ # generates byte-code for profiling
+@@ -1009,10 +1007,10 @@ endif
+ 
+ ifndef LIB_PACK_NAME
+ $(RESULT).cma:		$(REAL_IMPL_INTF) $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
+-			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@ $(REAL_IMPL)
++			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(OBJS_LIBS) -g $(ALL_LDFLAGS) -o $@ $(REAL_IMPL)
+ 
+ $(RESULT).cmxa $(RESULT).$(EXT_LIB):	$(REAL_IMPL_INTF) $(EXTRADEPS) $(RESULTDEPS)
+-			$(REAL_OCAMLFIND) $(OCAMLOPT) -a $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@ $(REAL_IMPL)
++			$(REAL_OCAMLFIND) $(OCAMLOPT) -a $(OBJS_LIBS) -g $(ALL_LDFLAGS) -o $@ $(REAL_IMPL)
+ else
+ # Packing a bytecode library
+ LIB_PACK_NAME_MLI = $(wildcard $(LIB_PACK_NAME).mli)
+@@ -1034,10 +1032,10 @@ $(LIB_PACK_NAME_CMI) $(LIB_PACK_NAME).cmx: $(REAL_IMPL_INTF)
+ endif
+ 
+ $(RESULT).cma:		$(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
+-			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@ $(LIB_PACK_NAME).cmo
++			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(OBJS_LIBS) -g $(ALL_LDFLAGS) -o $@ $(LIB_PACK_NAME).cmo
+ 
+ $(RESULT).cmxa $(RESULT).$(EXT_LIB):	$(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmx $(EXTRADEPS) $(RESULTDEPS)
+-			$(REAL_OCAMLFIND) $(OCAMLOPT) -a $(OBJS_LIBS) $(filter-out -custom, $(ALL_LDFLAGS)) -o $@ $(LIB_PACK_NAME).cmx
++			$(REAL_OCAMLFIND) $(OCAMLOPT) -a $(OBJS_LIBS) -g $(filter-out -custom, $(ALL_LDFLAGS)) -o $@ $(LIB_PACK_NAME).cmx
+ endif
+ 
+ $(RES_CLIB): 		$(OBJ_LINK)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4b32958..3da006a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-build-PIC-shared-objects.patch
 0003-Compile-with-debugging-symbols.patch
 0004-Fix-typo-in-debug-native-code-library-target-of-OCam.patch
+0005-Temporary-fix.patch

-- 
pcre-ocaml packaging