From: Julien Cristau <julien.cristau@ens-lyon.org>
Date: Wed, 4 Jan 2006 14:28:59 +0000 (+0000)
Subject: Modify configure patch to what was applied upstream in 3.09.1
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~678
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b60a089760c7db0f05b86c71799676f1650be871;p=ocaml.git

Modify configure patch to what was applied upstream in 3.09.1
---

diff --git a/debian/changelog b/debian/changelog
index fa0650c7..adfbec0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,9 @@ ocaml (3.09.0-5) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Patch configure to correctly detect sparc machines, and thus align doubles
-    on double-word boundaries (closes: #338437).
+    and 64-bit ints on double-word boundaries (closes: #338437).
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Tue,  3 Jan 2006 17:04:52 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Wed,  4 Jan 2006 15:28:00 +0100
 
 ocaml (3.09.0-4) unstable; urgency=low
 
diff --git a/debian/patches/sparc_needs_double_align.dpatch b/debian/patches/sparc_needs_double_align.dpatch
index d0899082..ab4f9dae 100644
--- a/debian/patches/sparc_needs_double_align.dpatch
+++ b/debian/patches/sparc_needs_double_align.dpatch
@@ -17,3 +17,12 @@
      # On Sparc V9 with certain versions of gcc, determination of double
      # alignment is not reliable (PR#1521), hence force it.
      # Same goes for hppa.
+@@ -434,7 +434,7 @@ esac
+ 
+ if $int64_native; then
+   case "$host" in
+-    hppa*-*-*)
++    sparc*-*-*|hppa*-*-*)
+       if test $2 = 8; then
+         echo "64-bit integers can be word-aligned."
+         echo "#undef ARCH_ALIGN_INT64" >> m.h