[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 3.11/master, updated. debian/3.11.0.beta1-1-13-gb539cc7

[Stephane Glondu]

The following commit has been merged in the 3.11/master branch:
commit a3f56e39be1eabeea867f622e7c9b64f5d9fda01
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Nov 29 20:03:45 2008 +0100

    Fix call_ld_with_proper_flags.dpatch
    
    The script generating myocamlbuild_config.ml uses config/Makefile and
    doesn't handle the subst function of make. We work around this by
    doing the substitution inside the configure script. This also
    incidentally fixes FTBFS with dash (Closes: #506286).

diff --git a/debian/patches/call_ld_with_proper_flags.dpatch b/debian/patches/call_ld_with_proper_flags.dpatch
index 4151fe2..5cb4a68 100755
--- a/debian/patches/call_ld_with_proper_flags.dpatch
+++ b/debian/patches/call_ld_with_proper_flags.dpatch
@@ -8,15 +8,14 @@
 
 @DPATCH@
 diff -urNad ocaml~/configure ocaml/configure
---- ocaml~/configure	2008-11-29 11:31:44.000000000 +0100
-+++ ocaml/configure	2008-11-29 11:31:48.000000000 +0100
-@@ -1548,7 +1548,8 @@
+--- ocaml~/configure	2008-12-02 01:24:33.000000000 +0100
++++ ocaml/configure	2008-12-02 01:26:02.000000000 +0100
+@@ -1548,7 +1548,7 @@
  echo "CC_PROFILE=$cc_profile" >> Makefile
  echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile
  echo "PARTIALLD=$partialld" >> Makefile
 -echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " >> Makefile
-+echo "Wl = -Wl," >> Makefile
-+echo "PACKLD=\$(PARTIALLD) $(subst \$(Wl),,\$(NATIVECCLINKOPTS)) -o " >> Makefile
++echo "PACKLD=\$(PARTIALLD) $(echo $nativecclinkopts|sed s/-Wl,//g) -o " >> Makefile
  echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile
  echo "IFLEXDIR=$iflexdir" >> Makefile
  echo "O=o" >> Makefile

-- 
OCaml packaging