[Pkg-ocaml-maint-commits] r2491 - in trunk/packages/ocaml/trunk/debian: . patches

[Julien Cristau]

Author: jcristau-guest
Date: 2006-01-12 14:32:42 +0000 (Thu, 12 Jan 2006)
New Revision: 2491

Added:
   trunk/packages/ocaml/trunk/debian/patches/call_ld_via_gcc.dpatch
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/patches/00list
Log:
Add patch to make ocamlopt -output-obj and ocamlopt -pack call the linker
via gcc instead of directly, which allows us to pass the same linking
options in these cases and in the common case (where ocamlopt already used
gcc). This should unbreak ocamlopt -pack on alpha, and thus fix the build
failure of camomile.


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2006-01-11 21:51:27 UTC (rev 2490)
+++ trunk/packages/ocaml/trunk/debian/changelog	2006-01-12 14:32:42 UTC (rev 2491)
@@ -5,8 +5,13 @@
 
   [ Julien Cristau ]
   * build-arch is a phony target.
+  * Add patch to make ocamlopt -output-obj and ocamlopt -pack call the linker
+    via gcc instead of directly, which allows us to pass the same linking
+    options in these cases and in the common case (where ocamlopt already used
+    gcc). This should unbreak ocamlopt -pack on alpha, and thus fix the build
+    failure of camomile.
 
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Mon,  9 Jan 2006 23:43:40 +0100
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 12 Jan 2006 15:29:51 +0100
 
 ocaml (3.09.1-1) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list	2006-01-11 21:51:27 UTC (rev 2490)
+++ trunk/packages/ocaml/trunk/debian/patches/00list	2006-01-12 14:32:42 UTC (rev 2491)
@@ -4,3 +4,4 @@
 man-ocamlmklib
 kbsd-gnu
 alpha_ld_no-relax
+call_ld_via_gcc

Added: trunk/packages/ocaml/trunk/debian/patches/call_ld_via_gcc.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/call_ld_via_gcc.dpatch	2006-01-11 21:51:27 UTC (rev 2490)
+++ trunk/packages/ocaml/trunk/debian/patches/call_ld_via_gcc.dpatch	2006-01-12 14:32:42 UTC (rev 2491)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## call_ld_via_gcc.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make ocamlopt -output-obj and -pack call ld via gcc instead of 
+## DP: directly, so the options we pass to it can be the same as in the normal 
+## DP: linking case
+
+ at DPATCH@
+
+--- ocaml-3.09.1.orig/Makefile	2005-09-24 18:20:36.000000000 +0200
++++ ocaml-3.09.1/Makefile	2006-01-12 10:17:42.000000000 +0100
+@@ -324,8 +324,8 @@
+             -e 's|%%BYTELINK%%|$(BYTECC) $(BYTECCLINKOPTS)|' \
+             -e 's|%%NATIVECC%%|$(NATIVECC) $(NATIVECCCOMPOPTS)|' \
+             -e 's|%%NATIVELINK%%|$(NATIVECC) $(NATIVECCLINKOPTS)|' \
+-            -e 's|%%PARTIALLD%%|ld -r $(NATIVECCLINKOPTS)|' \
+-            -e 's|%%PACKLD%%|ld -r $(NATIVECCLINKOPTS)|' \
++            -e 's|%%PARTIALLD%%|gcc -nostdlib -Wl,-r $(NATIVECCLINKOPTS)|' \
++            -e 's|%%PACKLD%%|gcc -nostdlib -Wl,-r $(NATIVECCLINKOPTS)|' \
+             -e 's|%%BYTECCLIBS%%|$(BYTECCLIBS)|' \
+             -e 's|%%NATIVECCLIBS%%|$(NATIVECCLIBS)|' \
+             -e 's|%%RANLIBCMD%%|$(RANLIBCMD)|' \