| 1 |
bicatali 10/06/03 19:40:25 |
| 2 |
|
| 3 |
Added: orpie-1.5.1-ocaml311.patch |
| 4 |
orpie-1.5.1-orpierc.patch orpie-1.5.1-nogsl.patch |
| 5 |
Log: |
| 6 |
Now build with system ocamlgsl. Added a fix for more recent ocaml, thanks Dylan Simon for his patch. Closing bug #297409 and bug #314651. Dropping ppc until we have ocamlgsl keyworded |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-calculators/orpie/files/orpie-1.5.1-ocaml311.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/orpie/files/orpie-1.5.1-ocaml311.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/orpie/files/orpie-1.5.1-ocaml311.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: orpie-1.5.1-ocaml311.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naru orpie-1.5.1/Makefile.in orpie-1.5.1_1/Makefile.in |
| 18 |
--- orpie-1.5.1/Makefile.in 2007-09-13 23:31:23.000000000 -0400 |
| 19 |
+++ orpie-1.5.1_1/Makefile.in 2010-05-12 11:44:33.000000000 -0400 |
| 20 |
@@ -257,10 +257,7 @@ |
| 21 |
units/%.cmo : units/%.ml |
| 22 |
$(OCAMLC) -c $(UNITS_BFLAGS) $< |
| 23 |
|
| 24 |
-units/%.o : units/%.ml |
| 25 |
- $(OCAMLOPT) -c $(UNITS_OFLAGS) $< |
| 26 |
- |
| 27 |
-units/%.cmx : units/%.ml |
| 28 |
+units/%.o units/%.cmx : units/%.ml |
| 29 |
$(OCAMLOPT) -c $(UNITS_OFLAGS) $< |
| 30 |
|
| 31 |
|
| 32 |
@@ -271,22 +268,15 @@ |
| 33 |
%.cmo : %.ml |
| 34 |
$(OCAMLC) -c $(BFLAGS) $< |
| 35 |
|
| 36 |
-%.o : %.ml |
| 37 |
- $(OCAMLOPT) -c $(OFLAGS) $< |
| 38 |
- |
| 39 |
-%.cmx : %.ml |
| 40 |
+%.o %.cmx : %.ml |
| 41 |
$(OCAMLOPT) -c $(OFLAGS) $< |
| 42 |
|
| 43 |
%.ml : %.mll |
| 44 |
$(OCAMLLEX) $< |
| 45 |
|
| 46 |
-%.ml : %.mly |
| 47 |
+%.ml %.mli : %.mly |
| 48 |
$(OCAMLYACC) -v $< |
| 49 |
|
| 50 |
-%.mli : %.mly |
| 51 |
- $(OCAMLYACC) -v $< |
| 52 |
- |
| 53 |
- |
| 54 |
|
| 55 |
# Emacs tags |
| 56 |
############ |
| 57 |
diff -Naru orpie-1.5.1/gsl/gsl_blas.ml orpie-1.5.1_1/gsl/gsl_blas.ml |
| 58 |
--- orpie-1.5.1/gsl/gsl_blas.ml 2007-09-13 23:31:23.000000000 -0400 |
| 59 |
+++ orpie-1.5.1_1/gsl/gsl_blas.ml 2010-05-12 11:24:11.000000000 -0400 |
| 60 |
@@ -118,6 +118,7 @@ |
| 61 |
|
| 62 |
(** {3 Single precision} *) |
| 63 |
|
| 64 |
+(* |
| 65 |
open Gsl_vector.Single |
| 66 |
open Gsl_matrix.Single |
| 67 |
|
| 68 |
@@ -187,6 +188,7 @@ |
| 69 |
alpha:float -> a:matrix -> b:matrix -> unit |
| 70 |
= "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm" |
| 71 |
end |
| 72 |
+*) |
| 73 |
|
| 74 |
|
| 75 |
(** {3 Complex} *) |
| 76 |
@@ -274,6 +276,7 @@ |
| 77 |
|
| 78 |
(** {3 Complex single precision} *) |
| 79 |
|
| 80 |
+(* |
| 81 |
open Gsl_vector_complex.Single |
| 82 |
open Gsl_matrix_complex.Single |
| 83 |
open Gsl_complex |
| 84 |
@@ -354,3 +357,4 @@ |
| 85 |
a:matrix -> b:matrix -> beta:float -> c:matrix -> unit |
| 86 |
= "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k" |
| 87 |
end |
| 88 |
+*) |
| 89 |
diff -Naru orpie-1.5.1/gsl/gsl_blas.mli orpie-1.5.1_1/gsl/gsl_blas.mli |
| 90 |
--- orpie-1.5.1/gsl/gsl_blas.mli 2007-09-13 23:31:23.000000000 -0400 |
| 91 |
+++ orpie-1.5.1_1/gsl/gsl_blas.mli 2010-05-12 11:23:36.000000000 -0400 |
| 92 |
@@ -118,6 +118,7 @@ |
| 93 |
|
| 94 |
(** {3 Single precision} *) |
| 95 |
|
| 96 |
+(* |
| 97 |
open Gsl_vector.Single |
| 98 |
open Gsl_matrix.Single |
| 99 |
|
| 100 |
@@ -187,6 +188,7 @@ |
| 101 |
alpha:float -> a:matrix -> b:matrix -> unit |
| 102 |
= "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm" |
| 103 |
end |
| 104 |
+*) |
| 105 |
|
| 106 |
|
| 107 |
(** {3 Complex} *) |
| 108 |
@@ -274,6 +276,7 @@ |
| 109 |
|
| 110 |
(** {3 Complex single precision} *) |
| 111 |
|
| 112 |
+(* |
| 113 |
open Gsl_vector_complex.Single |
| 114 |
open Gsl_matrix_complex.Single |
| 115 |
open Gsl_complex |
| 116 |
@@ -354,3 +357,4 @@ |
| 117 |
a:matrix -> b:matrix -> beta:float -> c:matrix -> unit |
| 118 |
= "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k" |
| 119 |
end |
| 120 |
+*) |
| 121 |
diff -Naru orpie-1.5.1/gsl/gsl_matrix.ml orpie-1.5.1_1/gsl/gsl_matrix.ml |
| 122 |
--- orpie-1.5.1/gsl/gsl_matrix.ml 2007-09-13 23:31:23.000000000 -0400 |
| 123 |
+++ orpie-1.5.1_1/gsl/gsl_matrix.ml 2010-05-12 11:22:51.000000000 -0400 |
| 124 |
@@ -86,6 +86,7 @@ |
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
+(* |
| 129 |
module Single = |
| 130 |
struct |
| 131 |
type float_mat_bigarr = |
| 132 |
@@ -164,3 +165,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.mli orpie-1.5.1_1/gsl/gsl_matrix.mli |
| 138 |
--- orpie-1.5.1/gsl/gsl_matrix.mli 2007-09-13 23:31:23.000000000 -0400 |
| 139 |
+++ orpie-1.5.1_1/gsl/gsl_matrix.mli 2010-05-12 11:22:42.000000000 -0400 |
| 140 |
@@ -45,6 +45,7 @@ |
| 141 |
external transpose_in_place : matrix -> unit = "ml_gsl_matrix_transpose" |
| 142 |
|
| 143 |
|
| 144 |
+(* |
| 145 |
module Single : sig |
| 146 |
|
| 147 |
type float_mat_bigarr = |
| 148 |
@@ -87,3 +88,4 @@ |
| 149 |
external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_float_transpose_memcpy" |
| 150 |
external transpose_in_place : matrix -> unit = "ml_gsl_matrix_float_transpose" |
| 151 |
end |
| 152 |
+*) |
| 153 |
diff -Naru orpie-1.5.1/gsl/gsl_matrix_complex.ml orpie-1.5.1_1/gsl/gsl_matrix_complex.ml |
| 154 |
--- orpie-1.5.1/gsl/gsl_matrix_complex.ml 2007-09-13 23:31:23.000000000 -0400 |
| 155 |
+++ orpie-1.5.1_1/gsl/gsl_matrix_complex.ml 2010-05-12 11:24:59.000000000 -0400 |
| 156 |
@@ -108,6 +108,7 @@ |
| 157 |
|
| 158 |
|
| 159 |
|
| 160 |
+(* |
| 161 |
module Single = |
| 162 |
struct |
| 163 |
type complex_float_mat_bigarr = |
| 164 |
@@ -208,3 +209,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_matrix_complex.mli orpie-1.5.1_1/gsl/gsl_matrix_complex.mli |
| 170 |
--- orpie-1.5.1/gsl/gsl_matrix_complex.mli 2007-09-13 23:31:23.000000000 -0400 |
| 171 |
+++ orpie-1.5.1_1/gsl/gsl_matrix_complex.mli 2010-05-12 11:25:00.000000000 -0400 |
| 172 |
@@ -51,6 +51,7 @@ |
| 173 |
external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_transpose" |
| 174 |
|
| 175 |
|
| 176 |
+(* |
| 177 |
module Single : sig |
| 178 |
|
| 179 |
type complex_float_mat_bigarr = |
| 180 |
@@ -96,3 +97,4 @@ |
| 181 |
external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_float_transpose_memcpy" |
| 182 |
external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_float_transpose" |
| 183 |
end |
| 184 |
+*) |
| 185 |
diff -Naru orpie-1.5.1/gsl/gsl_vector.ml orpie-1.5.1_1/gsl/gsl_vector.ml |
| 186 |
--- orpie-1.5.1/gsl/gsl_vector.ml 2007-09-13 23:31:23.000000000 -0400 |
| 187 |
+++ orpie-1.5.1_1/gsl/gsl_vector.ml 2010-05-12 11:22:19.000000000 -0400 |
| 188 |
@@ -95,6 +95,7 @@ |
| 189 |
|
| 190 |
|
| 191 |
|
| 192 |
+(* |
| 193 |
module Single = |
| 194 |
struct |
| 195 |
type float_vector_bigarr = |
| 196 |
@@ -178,3 +179,4 @@ |
| 197 |
external minmax_index : vector -> int * int |
| 198 |
= "ml_gsl_vector_float_minmaxindex" |
| 199 |
end |
| 200 |
+*) |
| 201 |
diff -Naru orpie-1.5.1/gsl/gsl_vector.mli orpie-1.5.1_1/gsl/gsl_vector.mli |
| 202 |
--- orpie-1.5.1/gsl/gsl_vector.mli 2007-09-13 23:31:23.000000000 -0400 |
| 203 |
+++ orpie-1.5.1_1/gsl/gsl_vector.mli 2010-05-12 11:22:19.000000000 -0400 |
| 204 |
@@ -65,6 +65,7 @@ |
| 205 |
|
| 206 |
(** {3 Single precision} *) |
| 207 |
|
| 208 |
+(* |
| 209 |
module Single : sig |
| 210 |
type float_vector_bigarr = |
| 211 |
(float, Bigarray.float32_elt, Bigarray.c_layout) Bigarray.Array1.t |
| 212 |
@@ -121,3 +122,4 @@ |
| 213 |
|
| 214 |
val subvector : vector -> off:int -> len:int -> vector |
| 215 |
end |
| 216 |
+*) |
| 217 |
|
| 218 |
|
| 219 |
|
| 220 |
1.1 sci-calculators/orpie/files/orpie-1.5.1-orpierc.patch |
| 221 |
|
| 222 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/orpie/files/orpie-1.5.1-orpierc.patch?rev=1.1&view=markup |
| 223 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/orpie/files/orpie-1.5.1-orpierc.patch?rev=1.1&content-type=text/plain |
| 224 |
|
| 225 |
Index: orpie-1.5.1-orpierc.patch |
| 226 |
=================================================================== |
| 227 |
--- orpie-1.5.1.orig/orpierc |
| 228 |
+++ orpie-1.5.1/orpierc |
| 229 |
@@ -4,7 +4,7 @@ |
| 230 |
# directory for storing Orpie data |
| 231 |
set datadir="~/.orpie/" |
| 232 |
# editor used for fullscreen viewing of stack elements |
| 233 |
-set editor="vi" |
| 234 |
+set editor="${EDITOR}" |
| 235 |
# whether or not to hide the help panel |
| 236 |
set hide_help="false" |
| 237 |
# whether or not to conserve memory in favor of faster rendering |
| 238 |
|
| 239 |
|
| 240 |
|
| 241 |
1.1 sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch |
| 242 |
|
| 243 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch?rev=1.1&view=markup |
| 244 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch?rev=1.1&content-type=text/plain |
| 245 |
|
| 246 |
Index: orpie-1.5.1-nogsl.patch |
| 247 |
=================================================================== |
| 248 |
--- Makefile.in.orig 2010-06-03 21:02:14.000000000 +0100 |
| 249 |
+++ Makefile.in 2010-06-03 21:02:49.000000000 +0100 |
| 250 |
@@ -38,7 +38,7 @@ |
| 251 |
CURSES_LIB = @CURSES_LIB@ |
| 252 |
GSL_LIB = @GSL_LIB@ |
| 253 |
|
| 254 |
-INCLUDES = -I ./curses -I ./gsl -I ./units |
| 255 |
+INCLUDES = -I ./curses -I /usr/lib/ocaml/gsl -I ./units |
| 256 |
BFLAGS = -pp camlp4o -g $(INCLUDES) -thread |
| 257 |
OFLAGS = -pp camlp4o $(INCLUDES) -thread |
| 258 |
BLFLAGS = -custom -cclib '@LDFLAGS@ $(CURSES_LIB) $(GSL_LIB) -lm' |
| 259 |
@@ -72,16 +72,8 @@ |
| 260 |
CURSES_BOBJS = $(CURSES_CMO) $(CURSES_COBJS) |
| 261 |
CURSES_OOBJS = $(CURSES_CMX) $(CURSES_COBJS) |
| 262 |
|
| 263 |
-GSL_CMO = gsl/gsl_error.cmo gsl/gsl_blas.cmo gsl/gsl_complex.cmo gsl/gsl_matrix.cmo gsl/gsl_matrix_complex.cmo \ |
| 264 |
- gsl/gsl_vector.cmo gsl/gsl_vector_complex.cmo gsl/gsl_vector_flat.cmo gsl/gsl_matrix_flat.cmo \ |
| 265 |
- gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \ |
| 266 |
- gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo |
| 267 |
-GSL_CMX = $(GSL_CMO:.cmo=.cmx) |
| 268 |
-GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o \ |
| 269 |
- gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_vector_double.o gsl/mlgsl_permut.o \ |
| 270 |
- gsl/mlgsl_linalg.o gsl/mlgsl_linalg_complex.o gsl/mlgsl_fun.o gsl/mlgsl_math.o gsl/mlgsl_sf.o |
| 271 |
-GSL_BOBJS = $(GSL_COBJS) $(GSL_CMO) |
| 272 |
-GSL_OOBJS = $(GSL_COBJS) $(GSL_CMX) |
| 273 |
+GSL_BOBJS = /usr/lib/ocaml/gsl/gsl.cma |
| 274 |
+GSL_OOBJS = /usr/lib/ocaml/gsl/gsl.cmxa |
| 275 |
|
| 276 |
UNITS_CMO = units/units.cmo |
| 277 |
UNITS_CMX = $(UNITS_CMO:.cmo=.cmx) |
Archives