orpie/orpie-1.5.1-ocaml311.patch

   1 diff -Naru orpie-1.5.1/Makefile.in orpie-1.5.1_1/Makefile.in
   2 --- orpie-1.5.1/Makefile.in     2007-09-13 23:31:23.000000000 -0400
   3 +++ orpie-1.5.1_1/Makefile.in   2010-05-12 11:44:33.000000000 -0400
   4 @@ -257,10 +257,7 @@
   5  units/%.cmo : units/%.ml
   6         $(OCAMLC) -c $(UNITS_BFLAGS) $<
   7
   8 -units/%.o : units/%.ml
   9 -       $(OCAMLOPT) -c $(UNITS_OFLAGS) $<
  10 -
  11 -units/%.cmx : units/%.ml
  12 +units/%.o units/%.cmx : units/%.ml
  13         $(OCAMLOPT) -c $(UNITS_OFLAGS) $<
  14
  15
  16 @@ -271,22 +268,15 @@
  17  %.cmo : %.ml
  18         $(OCAMLC) -c $(BFLAGS) $<
  19
  20 -%.o : %.ml
  21 -       $(OCAMLOPT) -c $(OFLAGS) $<
  22 -
  23 -%.cmx : %.ml
  24 +%.o %.cmx : %.ml
  25         $(OCAMLOPT) -c $(OFLAGS) $<
  26
  27  %.ml : %.mll
  28         $(OCAMLLEX) $<
  29
  30 -%.ml : %.mly
  31 +%.ml %.mli : %.mly
  32         $(OCAMLYACC) -v $<
  33
  34 -%.mli : %.mly
  35 -       $(OCAMLYACC) -v $<
  36 -
  37 -
  38
  39  # Emacs tags
  40  ############
  41 diff -Naru orpie-1.5.1/gsl/gsl_blas.ml orpie-1.5.1_1/gsl/gsl_blas.ml
  42 --- orpie-1.5.1/gsl/gsl_blas.ml 2007-09-13 23:31:23.000000000 -0400
  43 +++ orpie-1.5.1_1/gsl/gsl_blas.ml       2010-05-12 11:24:11.000000000 -0400
  44 @@ -118,6 +118,7 @@
  45
  46  (** {3 Single precision} *)
  47
  48 +(*
  49  open Gsl_vector.Single
  50  open Gsl_matrix.Single
  51
  52 @@ -187,6 +188,7 @@
  53      alpha:float -> a:matrix -> b:matrix -> unit
  54         = "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm"
  55    end
  56 +*)
  57
  58
  59  (** {3 Complex} *)
  60 @@ -274,6 +276,7 @@
  61
  62  (** {3 Complex single precision} *)
  63
  64 +(*
  65  open Gsl_vector_complex.Single
  66  open Gsl_matrix_complex.Single
  67  open Gsl_complex
  68 @@ -354,3 +357,4 @@
  69      a:matrix -> b:matrix -> beta:float -> c:matrix -> unit
  70         = "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k"
  71    end
  72 +*)
  73 diff -Naru orpie-1.5.1/gsl/gsl_blas.mli orpie-1.5.1_1/gsl/gsl_blas.mli
  74 --- orpie-1.5.1/gsl/gsl_blas.mli        2007-09-13 23:31:23.000000000 -0400
  75 +++ orpie-1.5.1_1/gsl/gsl_blas.mli      2010-05-12 11:23:36.000000000 -0400
  76 @@ -118,6 +118,7 @@
  77
  78  (** {3 Single precision} *)
  79
  80 +(*
  81  open Gsl_vector.Single
  82  open Gsl_matrix.Single
  83
  84 @@ -187,6 +188,7 @@
  85      alpha:float -> a:matrix -> b:matrix -> unit
  86         = "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm"
  87    end
  88 +*)
  89
  90
  91  (** {3 Complex} *)
  92 @@ -274,6 +276,7 @@
  93
  94  (** {3 Complex single precision} *)
  95
  96 +(*
  97  open Gsl_vector_complex.Single
  98  open Gsl_matrix_complex.Single
  99  open Gsl_complex
 100 @@ -354,3 +357,4 @@
 101      a:matrix -> b:matrix -> beta:float -> c:matrix -> unit
 102         = "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k"
 103    end
 104 +*)
 105 diff -Naru orpie-1.5.1/gsl/gsl_matrix.ml orpie-1.5.1_1/gsl/gsl_matrix.ml
 106 --- orpie-1.5.1/gsl/gsl_matrix.ml       2007-09-13 23:31:23.000000000 -0400
 107 +++ orpie-1.5.1_1/gsl/gsl_matrix.ml     2010-05-12 11:22:51.000000000 -0400
 108 @@ -86,6 +86,7 @@
 109
 110
 111  \f
 112 +(*
 113  module Single =
 114    struct
 115    type float_mat_bigarr =
 116 @@ -164,3 +165,4 @@
 117    external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_float_transpose_memcpy"
 118    external transpose_in_place : matrix -> unit = "ml_gsl_matrix_float_transpose"
 119    end
 120 +*)
 121 diff -Naru orpie-1.5.1/gsl/gsl_matrix.mli orpie-1.5.1_1/gsl/gsl_matrix.mli
 122 --- orpie-1.5.1/gsl/gsl_matrix.mli      2007-09-13 23:31:23.000000000 -0400
 123 +++ orpie-1.5.1_1/gsl/gsl_matrix.mli    2010-05-12 11:22:42.000000000 -0400
 124 @@ -45,6 +45,7 @@
 125  external transpose_in_place : matrix -> unit = "ml_gsl_matrix_transpose"
 126
 127
 128 +(*
 129  module Single : sig
 130
 131    type float_mat_bigarr =
 132 @@ -87,3 +88,4 @@
 133    external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_float_transpose_memcpy"
 134    external transpose_in_place : matrix -> unit = "ml_gsl_matrix_float_transpose"
 135  end
 136 +*)
 137 diff -Naru orpie-1.5.1/gsl/gsl_matrix_complex.ml orpie-1.5.1_1/gsl/gsl_matrix_complex.ml
 138 --- orpie-1.5.1/gsl/gsl_matrix_complex.ml       2007-09-13 23:31:23.000000000 -0400
 139 +++ orpie-1.5.1_1/gsl/gsl_matrix_complex.ml     2010-05-12 11:24:59.000000000 -0400
 140 @@ -108,6 +108,7 @@
 141
 142
 143  \f
 144 +(*
 145  module Single =
 146    struct
 147    type complex_float_mat_bigarr =
 148 @@ -208,3 +209,4 @@
 149    external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_float_transpose_memcpy"
 150    external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_float_transpose"
 151    end
 152 +*)
 153 diff -Naru orpie-1.5.1/gsl/gsl_matrix_complex.mli orpie-1.5.1_1/gsl/gsl_matrix_complex.mli
 154 --- orpie-1.5.1/gsl/gsl_matrix_complex.mli      2007-09-13 23:31:23.000000000 -0400
 155 +++ orpie-1.5.1_1/gsl/gsl_matrix_complex.mli    2010-05-12 11:25:00.000000000 -0400
 156 @@ -51,6 +51,7 @@
 157  external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_transpose"
 158
 159
 160 +(*
 161  module Single : sig
 162
 163    type complex_float_mat_bigarr =
 164 @@ -96,3 +97,4 @@
 165    external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_float_transpose_memcpy"
 166    external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_float_transpose"
 167  end
 168 +*)
 169 diff -Naru orpie-1.5.1/gsl/gsl_vector.ml orpie-1.5.1_1/gsl/gsl_vector.ml
 170 --- orpie-1.5.1/gsl/gsl_vector.ml       2007-09-13 23:31:23.000000000 -0400
 171 +++ orpie-1.5.1_1/gsl/gsl_vector.ml     2010-05-12 11:22:19.000000000 -0400
 172 @@ -95,6 +95,7 @@
 173
 174
 175  \f
 176 +(*
 177  module Single =
 178  struct
 179    type float_vector_bigarr =
 180 @@ -178,3 +179,4 @@
 181    external minmax_index : vector -> int * int
 182        = "ml_gsl_vector_float_minmaxindex"
 183  end
 184 +*)
 185 diff -Naru orpie-1.5.1/gsl/gsl_vector.mli orpie-1.5.1_1/gsl/gsl_vector.mli
 186 --- orpie-1.5.1/gsl/gsl_vector.mli      2007-09-13 23:31:23.000000000 -0400
 187 +++ orpie-1.5.1_1/gsl/gsl_vector.mli    2010-05-12 11:22:19.000000000 -0400
 188 @@ -65,6 +65,7 @@
 189
 190  (** {3 Single precision} *)
 191
 192 +(*
 193  module Single : sig
 194    type float_vector_bigarr =
 195        (float, Bigarray.float32_elt, Bigarray.c_layout) Bigarray.Array1.t
 196 @@ -121,3 +122,4 @@
 197
 198    val subvector : vector -> off:int -> len:int -> vector
 199  end
 200 +*)