Add patch by Steve Langasek <vorlon@debian.org> to fix native code linking

by passing the --no-relax option to ld (Closes: #338437).

diff --git a/debian/changelog b/debian/changelog
index 84e3e9b39d1e40711e80372ad4c82118a52d39ee..9d5e493509b49a740c459640b7a0ccd959a47ec5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ ocaml (3.09.0-2) unstable; urgency=low
   * 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@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@ens-lyon.org>  Thu, 10 Nov 2005 17:09:00 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Thu,  8 Dec 2005 10:19:39 +0100
 
 ocaml (3.09.0-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index d1507087129aa092ccba9e10b21894e8c48c27d3..de6b75524d7d42b665e2bbf8dc8cd94174cf9498 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@ versioned_libdir
 objinfo
 man-ocamlmklib
 kbsd-gnu
+alpha_ld_no-relax

diff --git a/debian/patches/alpha_ld_no-relax.dpatch b/debian/patches/alpha_ld_no-relax.dpatch
new file mode 100644 (file)
index 0000000..6c398e6
--- /dev/null
+++ b/debian/patches/alpha_ld_no-relax.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## alpha_ld_no-relax.dpatch by Steve Langasek <vorlon@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)
+
+@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