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

[Julien Cristau]

Author: jcristau-guest
Date: 2005-12-08 09:24:29 +0000 (Thu, 08 Dec 2005)
New Revision: 2270

Added:
   trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/patches/00list
Log:
Add patch by Steve Langasek <vorlon at debian.org> to fix native code linking
by passing the --no-relax option to ld (Closes: #338437).      


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-12-08 00:35:23 UTC (rev 2269)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-12-08 09:24:29 UTC (rev 2270)
@@ -5,8 +5,12 @@
   * New patch kbsd-gnu.dpatch to add support for GNU/Hurd and GNU/k*BSD on
     i386 (thanks to Robert Millan and Aurélien Jarno; Closes: #216886).
   * Add myself to Uploaders (acked by Sven).
+  * Add patch by Steve Langasek <vorlon at debian.org> to fix native code linking
+    by passing the --no-relax option to ld (Closes: #338437).
+    Bug#335578 stays open since a proper fix to the generated asm would still
+    be better than this workaround.
 
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 10 Nov 2005 17:09:00 +0100
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu,  8 Dec 2005 10:19:39 +0100
 
 ocaml (3.09.0-1) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list	2005-12-08 00:35:23 UTC (rev 2269)
+++ trunk/packages/ocaml/trunk/debian/patches/00list	2005-12-08 09:24:29 UTC (rev 2270)
@@ -2,3 +2,4 @@
 objinfo
 man-ocamlmklib
 kbsd-gnu
+alpha_ld_no-relax

Added: trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch	2005-12-08 00:35:23 UTC (rev 2269)
+++ trunk/packages/ocaml/trunk/debian/patches/alpha_ld_no-relax.dpatch	2005-12-08 09:24:29 UTC (rev 2270)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## alpha_ld_no-relax.dpatch by Steve Langasek <vorlon at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Pass the --no-relax option to ld to fix a segfault in initialization 
+## DP: code (bug#338437)
+
+ at DPATCH@
+
+--- ocaml-3.09.0.orig/configure	2005-09-24 02:19:09.000000000 -0700
++++ ocaml-3.09.0/configure	2005-12-07 22:03:36.019001353 -0800
+@@ -268,7 +268,8 @@
+   gcc,alpha*-*-linux*)
+     if cc="$bytecc" sh ./hasgot -mieee; then
+       bytecccompopts="-mieee $bytecccompopts";
+-    fi;;
++    fi
++    bytecclinkopts="-Wl,--no-relax";;
+   cc,mips-*-irix6*)
+     # Add -n32 flag to ensure compatibility with native-code compiler
+     bytecccompopts="-n32"
+@@ -612,6 +613,7 @@
+                        nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
+   *,*,rhapsody,*)
+                  nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";;
++  alpha,gcc*,linux*,*) nativecclinkopts="-Wl,--no-relax";;
+   *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
+   *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
+ esac