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

[Julien Cristau]

Author: jcristau-guest
Date: 2006-01-04 14:28:59 +0000 (Wed, 04 Jan 2006)
New Revision: 2362

Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/patches/sparc_needs_double_align.dpatch
Log:
Modify configure patch to what was applied upstream in 3.09.1

Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2006-01-04 13:11:52 UTC (rev 2361)
+++ trunk/packages/ocaml/trunk/debian/changelog	2006-01-04 14:28:59 UTC (rev 2362)
@@ -7,9 +7,9 @@
 
   [ 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 at ens-lyon.org>  Tue,  3 Jan 2006 17:04:52 +0100
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Wed,  4 Jan 2006 15:28:00 +0100
 
 ocaml (3.09.0-4) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/patches/sparc_needs_double_align.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/sparc_needs_double_align.dpatch	2006-01-04 13:11:52 UTC (rev 2361)
+++ trunk/packages/ocaml/trunk/debian/patches/sparc_needs_double_align.dpatch	2006-01-04 14:28:59 UTC (rev 2362)
@@ -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