tags 527732 +patch
tags 550058 +patch
thanks
Hello,
I recently looked at FTBFS bug #527732, and eventually fixed it (I
don't know ocaml that well). In the process, I also fixed #550058,
which is using a convenience copy of the Gnu Scientific Library.
This patch disables the convenience copy of the GSL and links against
libocamlgsl-ocaml-dev, which fixes the FTBFS. Someone who knows Ocaml
better than me should check and be sure that what I'm doing is sane,
but it compiles and orpie runs fine.
There is a file, `depend`, listing compilation dependencies. I had to
regenerate this, since compiling the GSL is now unnecessary. Each
regeneration clobbers the previous copy. This patch ships a new copy
of `depend` with the new changes, instead of calling `depend` at
compile-time (which can't be easily inverted). Please handle this as
you see best.
I noticed that the test case does not compile (it wasn't even set to
before), but I don't think it's related to what I did - but someone
could check.
- Richard
--
| Richard Darst - rkd@ - ehrenfest: up 3 days, 9:19
| http://rkd.zgib.net - pgp 0xBD356740
| "Ye shall know the truth and -- the truth shall make you free"
diff -u orpie-1.5.1/debian/changelog orpie-1.5.1/debian/changelog
--- orpie-1.5.1/debian/changelog
+++ orpie-1.5.1/debian/changelog
@@ -1,3 +1,15 @@
+orpie (1.5.1-7.1) unstable; urgency=low
+
+ * Fix FTBFS (Closes: #527732).
+ * While fixing the FTBFS, link against the system-wide libocamlgsl-ocaml
+ libraries. (Closes: #550058).
+ * Regenerate the depend file included in the distribution, to make
+ building avoid compile of private GSL files. Since depend was
+ statically included in the distribution, I left it statically
+ included instead of dynamically regenerating.
+
+ -- Richard Darst <r...@zgib.net> Mon, 16 Nov 2009 03:55:07 -0500
+
orpie (1.5.1-7) unstable; urgency=low
* Added hurd-i386 to architecture list (Closes: #482903)
diff -u orpie-1.5.1/debian/control orpie-1.5.1/debian/control
--- orpie-1.5.1/debian/control
+++ orpie-1.5.1/debian/control
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Uwe Steinmann <ste...@debian.org>
-Build-Depends: ocaml-nox (>= 3.10.0), camlp4 (>= 3.10.0), libgsl0-dev (>= 1.4), debhelper (>> 3.0.0)
+Build-Depends: ocaml-nox (>= 3.10.0), camlp4 (>= 3.10.0), libgsl0-dev (>= 1.4), debhelper (>> 3.0.0), libocamlgsl-ocaml-dev
Standards-Version: 3.7.2
Package: orpie
only in patch2:
unchanged:
--- orpie-1.5.1.orig/depend
+++ orpie-1.5.1/depend
@@ -1,59 +1,81 @@
add.cmo: ./units/units.cmo rpc_stack.cmo rcfile.cmo \
- ./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi gsl_assist.cmo
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi gsl_assist.cmo
add.cmx: ./units/units.cmx rpc_stack.cmx rcfile.cmx \
- ./gsl/gsl_matrix_complex.cmx ./gsl/gsl_matrix.cmx gsl_assist.cmx
-calc_test.cmo: txtin_parser.cmi txtin_lexer.cmo rpc_stack.cmo rpc_calc.cmo
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi gsl_assist.cmx
+big_int_str.cmo:
+big_int_str.cmx:
+calc_test.cmo: txtin_parser.cmo txtin_lexer.cmo rpc_stack.cmo rpc_calc.cmo
calc_test.cmx: txtin_parser.cmx txtin_lexer.cmx rpc_stack.cmx rpc_calc.cmx
-curses_assist.cmo: ./curses/curses.cmi
-curses_assist.cmx: ./curses/curses.cmx
curses-keys.cmo: curses_assist.cmo ./curses/curses.cmi
curses-keys.cmx: curses_assist.cmx ./curses/curses.cmx
-div.cmo: ./units/units.cmo rpc_stack.cmo ./gsl/gsl_vectmat.cmi \
- ./gsl/gsl_permut.cmi ./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi \
- ./gsl/gsl_linalg.cmi ./gsl/gsl_error.cmi ./gsl/gsl_blas.cmi \
+curses_assist.cmo: ./curses/curses.cmi
+curses_assist.cmx: ./curses/curses.cmx
+div.cmo: ./units/units.cmo rpc_stack.cmo /usr/lib/ocaml/gsl/gsl_vectmat.cmi \
+ /usr/lib/ocaml/gsl/gsl_permut.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi \
+ /usr/lib/ocaml/gsl/gsl_error.cmi /usr/lib/ocaml/gsl/gsl_blas.cmi \
gsl_assist.cmo
-div.cmx: ./units/units.cmx rpc_stack.cmx ./gsl/gsl_vectmat.cmx \
- ./gsl/gsl_permut.cmx ./gsl/gsl_matrix_complex.cmx ./gsl/gsl_matrix.cmx \
- ./gsl/gsl_linalg.cmx ./gsl/gsl_error.cmx ./gsl/gsl_blas.cmx \
+div.cmx: ./units/units.cmx rpc_stack.cmx /usr/lib/ocaml/gsl/gsl_vectmat.cmi \
+ /usr/lib/ocaml/gsl/gsl_permut.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi \
+ /usr/lib/ocaml/gsl/gsl_error.cmi /usr/lib/ocaml/gsl/gsl_blas.cmi \
gsl_assist.cmx
-gsl_assist.cmo: ./gsl/gsl_vector_complex_flat.cmi \
- ./gsl/gsl_vector_complex.cmi ./gsl/gsl_vectmat.cmi ./gsl/gsl_permut.cmi \
- ./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi ./gsl/gsl_linalg.cmi
-gsl_assist.cmx: ./gsl/gsl_vector_complex_flat.cmx \
- ./gsl/gsl_vector_complex.cmx ./gsl/gsl_vectmat.cmx ./gsl/gsl_permut.cmx \
- ./gsl/gsl_matrix_complex.cmx ./gsl/gsl_matrix.cmx ./gsl/gsl_linalg.cmx
+gsl_assist.cmo: /usr/lib/ocaml/gsl/gsl_vector_complex_flat.cmi \
+ /usr/lib/ocaml/gsl/gsl_vector_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_vectmat.cmi /usr/lib/ocaml/gsl/gsl_permut.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi
+gsl_assist.cmx: /usr/lib/ocaml/gsl/gsl_vector_complex_flat.cmi \
+ /usr/lib/ocaml/gsl/gsl_vector_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_vectmat.cmi /usr/lib/ocaml/gsl/gsl_permut.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi
+install.cmo:
+install.cmx:
+interface.cmo: version.cmo rpc_calc.cmo operations.cmo ./curses/curses.cmi
+interface.cmx: version.cmx rpc_calc.cmx operations.cmx ./curses/curses.cmx
interface_draw.cmo: utility.cmo rpc_stack.cmo rpc_calc.cmo rcfile.cmo \
operations.cmo interface.cmo ./curses/curses.cmi
interface_draw.cmx: utility.cmx rpc_stack.cmx rpc_calc.cmx rcfile.cmx \
operations.cmx interface.cmx ./curses/curses.cmx
-interface_main.cmo: utility.cmo ./units/units.cmo txtin_parser.cmi \
+interface_main.cmo: utility.cmo ./units/units.cmo txtin_parser.cmo \
txtin_lexer.cmo statefile.cmo rpc_stack.cmo rpc_calc.cmo rcfile.cmo \
operations.cmo interface_draw.cmo interface.cmo \
- ./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi ./curses/curses.cmi \
- big_int_str.cmo
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi ./curses/curses.cmi big_int_str.cmo
interface_main.cmx: utility.cmx ./units/units.cmx txtin_parser.cmx \
txtin_lexer.cmx statefile.cmx rpc_stack.cmx rpc_calc.cmx rcfile.cmx \
operations.cmx interface_draw.cmx interface.cmx \
- ./gsl/gsl_matrix_complex.cmx ./gsl/gsl_matrix.cmx ./curses/curses.cmx \
- big_int_str.cmx
-interface.cmo: rpc_calc.cmo operations.cmo ./curses/curses.cmi
-interface.cmx: rpc_calc.cmx operations.cmx ./curses/curses.cmx
-inv.cmo: ./units/units.cmo rpc_stack.cmo ./gsl/gsl_vector.cmi \
- ./gsl/gsl_vectmat.cmi ./gsl/gsl_permut.cmi ./gsl/gsl_matrix_complex.cmi \
- ./gsl/gsl_matrix.cmi ./gsl/gsl_linalg.cmi ./gsl/gsl_error.cmi \
- gsl_assist.cmo
-inv.cmx: ./units/units.cmx rpc_stack.cmx ./gsl/gsl_vector.cmx \
- ./gsl/gsl_vectmat.cmx ./gsl/gsl_permut.cmx ./gsl/gsl_matrix_complex.cmx \
- ./gsl/gsl_matrix.cmx ./gsl/gsl_linalg.cmx ./gsl/gsl_error.cmx \
- gsl_assist.cmx
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi ./curses/curses.cmx big_int_str.cmx
+inv.cmo: ./units/units.cmo rpc_stack.cmo /usr/lib/ocaml/gsl/gsl_vector.cmi \
+ /usr/lib/ocaml/gsl/gsl_vectmat.cmi /usr/lib/ocaml/gsl/gsl_permut.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi \
+ /usr/lib/ocaml/gsl/gsl_error.cmi gsl_assist.cmo
+inv.cmx: ./units/units.cmx rpc_stack.cmx /usr/lib/ocaml/gsl/gsl_vector.cmi \
+ /usr/lib/ocaml/gsl/gsl_vectmat.cmi /usr/lib/ocaml/gsl/gsl_permut.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi \
+ /usr/lib/ocaml/gsl/gsl_error.cmi gsl_assist.cmx
main.cmo: rpc_calc.cmo rcfile.cmo interface_main.cmo interface.cmo \
- ./gsl/gsl_error.cmi ./curses/curses.cmi
+ /usr/lib/ocaml/gsl/gsl_error.cmi ./curses/curses.cmi
main.cmx: rpc_calc.cmx rcfile.cmx interface_main.cmx interface.cmx \
- ./gsl/gsl_error.cmx ./curses/curses.cmx
-mult.cmo: ./units/units.cmo rpc_stack.cmo ./gsl/gsl_matrix_complex.cmi \
- ./gsl/gsl_matrix.cmi ./gsl/gsl_blas.cmi gsl_assist.cmo
-mult.cmx: ./units/units.cmx rpc_stack.cmx ./gsl/gsl_matrix_complex.cmx \
- ./gsl/gsl_matrix.cmx ./gsl/gsl_blas.cmx gsl_assist.cmx
+ /usr/lib/ocaml/gsl/gsl_error.cmi ./curses/curses.cmx
+mult.cmo: ./units/units.cmo rpc_stack.cmo \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_blas.cmi \
+ gsl_assist.cmo
+mult.cmx: ./units/units.cmx rpc_stack.cmx \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_blas.cmi \
+ gsl_assist.cmx
+operations.cmo:
+operations.cmx:
pow.cmo: ./units/units.cmo rpc_stack.cmo gsl_assist.cmo
pow.cmx: ./units/units.cmx rpc_stack.cmx gsl_assist.cmx
rcfile.cmo: utility.cmo ./units/units.cmo operations.cmo install.cmo \
@@ -61,46 +83,64 @@
rcfile.cmx: utility.cmx ./units/units.cmx operations.cmx install.cmx \
./curses/curses.cmx
rpc_calc.cmo: ./units/units.cmo sub.cmo solvelin.cmo rpc_stack.cmo rcfile.cmo \
- pow.cmo mult.cmo inv.cmo ./gsl/gsl_sf.cmo ./gsl/gsl_matrix_complex.cmi \
- ./gsl/gsl_matrix.cmi ./gsl/gsl_math.cmi ./gsl/gsl_error.cmi \
- ./gsl/gsl_complex.cmi ./gsl/gsl_blas.cmi gsl_assist.cmo div.cmo add.cmo
+ pow.cmo mult.cmo inv.cmo /usr/lib/ocaml/gsl/gsl_sf.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_math.cmi \
+ /usr/lib/ocaml/gsl/gsl_error.cmi /usr/lib/ocaml/gsl/gsl_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_blas.cmi gsl_assist.cmo div.cmo add.cmo
rpc_calc.cmx: ./units/units.cmx sub.cmx solvelin.cmx rpc_stack.cmx rcfile.cmx \
- pow.cmx mult.cmx inv.cmx ./gsl/gsl_sf.cmx ./gsl/gsl_matrix_complex.cmx \
- ./gsl/gsl_matrix.cmx ./gsl/gsl_math.cmx ./gsl/gsl_error.cmx \
- ./gsl/gsl_complex.cmx ./gsl/gsl_blas.cmx gsl_assist.cmx div.cmx add.cmx
-rpc_stack.cmo: ./units/units.cmo ./gsl/gsl_matrix_complex.cmi \
- ./gsl/gsl_matrix.cmi big_int_str.cmo
-rpc_stack.cmx: ./units/units.cmx ./gsl/gsl_matrix_complex.cmx \
- ./gsl/gsl_matrix.cmx big_int_str.cmx
-solvelin.cmo: ./units/units.cmo rpc_stack.cmo ./gsl/gsl_vector_complex.cmi \
- ./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi ./gsl/gsl_linalg.cmi \
+ pow.cmx mult.cmx inv.cmx /usr/lib/ocaml/gsl/gsl_sf.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_math.cmi \
+ /usr/lib/ocaml/gsl/gsl_error.cmi /usr/lib/ocaml/gsl/gsl_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_blas.cmi gsl_assist.cmx div.cmx add.cmx
+rpc_stack.cmo: ./units/units.cmo /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi big_int_str.cmo
+rpc_stack.cmx: ./units/units.cmx /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi big_int_str.cmx
+solvelin.cmo: ./units/units.cmo rpc_stack.cmo \
+ /usr/lib/ocaml/gsl/gsl_vector_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi \
gsl_assist.cmo
-solvelin.cmx: ./units/units.cmx rpc_stack.cmx ./gsl/gsl_vector_complex.cmx \
- ./gsl/gsl_matrix_complex.cmx ./gsl/gsl_matrix.cmx ./gsl/gsl_linalg.cmx \
+solvelin.cmx: ./units/units.cmx rpc_stack.cmx \
+ /usr/lib/ocaml/gsl/gsl_vector_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi /usr/lib/ocaml/gsl/gsl_linalg.cmi \
gsl_assist.cmx
-statefile.cmo: utility.cmo rpc_stack.cmo rpc_calc.cmo rcfile.cmo \
+statefile.cmo: version.cmo utility.cmo rpc_stack.cmo rpc_calc.cmo rcfile.cmo \
operations.cmo
-statefile.cmx: utility.cmx rpc_stack.cmx rpc_calc.cmx rcfile.cmx \
+statefile.cmx: version.cmx utility.cmx rpc_stack.cmx rpc_calc.cmx rcfile.cmx \
operations.cmx
sub.cmo: ./units/units.cmo rpc_stack.cmo rcfile.cmo \
- ./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi gsl_assist.cmo
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi gsl_assist.cmo
sub.cmx: ./units/units.cmx rpc_stack.cmx rcfile.cmx \
- ./gsl/gsl_matrix_complex.cmx ./gsl/gsl_matrix.cmx gsl_assist.cmx
-txtin_lexer.cmo: txtin_parser.cmi
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi gsl_assist.cmx
+txtin_lexer.cmo: txtin_parser.cmo
txtin_lexer.cmx: txtin_parser.cmx
txtin_parser.cmo: utility.cmo ./units/units.cmo rpc_stack.cmo rcfile.cmo \
- ./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi big_int_str.cmo \
- txtin_parser.cmi
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi big_int_str.cmo
txtin_parser.cmx: utility.cmx ./units/units.cmx rpc_stack.cmx rcfile.cmx \
- ./gsl/gsl_matrix_complex.cmx ./gsl/gsl_matrix.cmx big_int_str.cmx \
- txtin_parser.cmi
-txtin_parser.cmi: rpc_stack.cmo
+ /usr/lib/ocaml/gsl/gsl_matrix_complex.cmi \
+ /usr/lib/ocaml/gsl/gsl_matrix.cmi big_int_str.cmx
+utility.cmo:
+utility.cmx:
+version.cmo:
+version.cmx:
units/test.cmo: ./units/units.cmo
units/test.cmx: ./units/units.cmx
+units/units.cmo:
+units/units.cmx:
curses/curses.cmo: curses/curses.cmi
curses/curses.cmx: curses/curses.cmi
+curses/keys.cmo:
+curses/keys.cmx:
curses/test.cmo: ./curses/curses.cmi
curses/test.cmx: ./curses/curses.cmx
+curses/curses.cmi:
gsl/gsl_blas.cmo: ./gsl/gsl_vector_complex.cmi ./gsl/gsl_vector.cmi \
./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi ./gsl/gsl_complex.cmi \
gsl/gsl_blas.cmi
@@ -121,16 +161,16 @@
./gsl/gsl_complex.cmx gsl/gsl_linalg.cmi
gsl/gsl_math.cmo: gsl/gsl_math.cmi
gsl/gsl_math.cmx: gsl/gsl_math.cmi
+gsl/gsl_matrix.cmo: gsl/gsl_matrix.cmi
+gsl/gsl_matrix.cmx: gsl/gsl_matrix.cmi
+gsl/gsl_matrix_complex.cmo: ./gsl/gsl_complex.cmi gsl/gsl_matrix_complex.cmi
+gsl/gsl_matrix_complex.cmx: ./gsl/gsl_complex.cmx gsl/gsl_matrix_complex.cmi
gsl/gsl_matrix_complex_flat.cmo: ./gsl/gsl_vector_complex_flat.cmi \
./gsl/gsl_complex.cmi gsl/gsl_matrix_complex_flat.cmi
gsl/gsl_matrix_complex_flat.cmx: ./gsl/gsl_vector_complex_flat.cmx \
./gsl/gsl_complex.cmx gsl/gsl_matrix_complex_flat.cmi
-gsl/gsl_matrix_complex.cmo: ./gsl/gsl_complex.cmi gsl/gsl_matrix_complex.cmi
-gsl/gsl_matrix_complex.cmx: ./gsl/gsl_complex.cmx gsl/gsl_matrix_complex.cmi
gsl/gsl_matrix_flat.cmo: ./gsl/gsl_vector_flat.cmi gsl/gsl_matrix_flat.cmi
gsl/gsl_matrix_flat.cmx: ./gsl/gsl_vector_flat.cmx gsl/gsl_matrix_flat.cmi
-gsl/gsl_matrix.cmo: gsl/gsl_matrix.cmi
-gsl/gsl_matrix.cmx: gsl/gsl_matrix.cmi
gsl/gsl_permut.cmo: ./gsl/gsl_error.cmi ./gsl/gsl_complex.cmi \
gsl/gsl_permut.cmi
gsl/gsl_permut.cmx: ./gsl/gsl_error.cmx ./gsl/gsl_complex.cmx \
@@ -147,33 +187,39 @@
./gsl/gsl_vector.cmx ./gsl/gsl_matrix_flat.cmx \
./gsl/gsl_matrix_complex_flat.cmx ./gsl/gsl_matrix_complex.cmx \
./gsl/gsl_matrix.cmx gsl/gsl_vectmat.cmi
+gsl/gsl_vector.cmo: gsl/gsl_vector.cmi
+gsl/gsl_vector.cmx: gsl/gsl_vector.cmi
+gsl/gsl_vector_complex.cmo: ./gsl/gsl_complex.cmi gsl/gsl_vector_complex.cmi
+gsl/gsl_vector_complex.cmx: ./gsl/gsl_complex.cmx gsl/gsl_vector_complex.cmi
gsl/gsl_vector_complex_flat.cmo: ./gsl/gsl_vector_flat.cmi \
./gsl/gsl_complex.cmi gsl/gsl_vector_complex_flat.cmi
gsl/gsl_vector_complex_flat.cmx: ./gsl/gsl_vector_flat.cmx \
./gsl/gsl_complex.cmx gsl/gsl_vector_complex_flat.cmi
-gsl/gsl_vector_complex.cmo: ./gsl/gsl_complex.cmi gsl/gsl_vector_complex.cmi
-gsl/gsl_vector_complex.cmx: ./gsl/gsl_complex.cmx gsl/gsl_vector_complex.cmi
gsl/gsl_vector_flat.cmo: gsl/gsl_vector_flat.cmi
gsl/gsl_vector_flat.cmx: gsl/gsl_vector_flat.cmi
-gsl/gsl_vector.cmo: gsl/gsl_vector.cmi
-gsl/gsl_vector.cmx: gsl/gsl_vector.cmi
gsl/gsl_blas.cmi: ./gsl/gsl_vector_complex.cmi ./gsl/gsl_vector.cmi \
./gsl/gsl_matrix_complex.cmi ./gsl/gsl_matrix.cmi ./gsl/gsl_complex.cmi
+gsl/gsl_complex.cmi:
+gsl/gsl_error.cmi:
gsl/gsl_fun.cmi: ./gsl/gsl_vector.cmi ./gsl/gsl_matrix.cmi
gsl/gsl_linalg.cmi: ./gsl/gsl_vector_flat.cmi ./gsl/gsl_vector.cmi \
./gsl/gsl_vectmat.cmi ./gsl/gsl_permut.cmi ./gsl/gsl_matrix_flat.cmi \
./gsl/gsl_matrix.cmi ./gsl/gsl_fun.cmi ./gsl/gsl_complex.cmi
-gsl/gsl_matrix_complex_flat.cmi: ./gsl/gsl_vector_complex_flat.cmi \
- ./gsl/gsl_complex.cmi
+gsl/gsl_math.cmi:
+gsl/gsl_matrix.cmi: ./gsl/gsl_vector.cmi
gsl/gsl_matrix_complex.cmi: ./gsl/gsl_vector_complex.cmi \
./gsl/gsl_complex.cmi
+gsl/gsl_matrix_complex_flat.cmi: ./gsl/gsl_vector_complex_flat.cmi \
+ ./gsl/gsl_complex.cmi
gsl/gsl_matrix_flat.cmi: ./gsl/gsl_vector_flat.cmi
-gsl/gsl_matrix.cmi: ./gsl/gsl_vector.cmi
+gsl/gsl_permut.cmi:
gsl/gsl_vectmat.cmi: ./gsl/gsl_vector_flat.cmi \
./gsl/gsl_vector_complex_flat.cmi ./gsl/gsl_vector_complex.cmi \
./gsl/gsl_vector.cmi ./gsl/gsl_matrix_flat.cmi \
./gsl/gsl_matrix_complex_flat.cmi ./gsl/gsl_matrix_complex.cmi \
./gsl/gsl_matrix.cmi ./gsl/gsl_complex.cmi
+gsl/gsl_vector.cmi:
+gsl/gsl_vector_complex.cmi: ./gsl/gsl_complex.cmi
gsl/gsl_vector_complex_flat.cmi: ./gsl/gsl_vector_flat.cmi \
./gsl/gsl_complex.cmi
-gsl/gsl_vector_complex.cmi: ./gsl/gsl_complex.cmi
+gsl/gsl_vector_flat.cmi:
only in patch2:
unchanged:
--- orpie-1.5.1.orig/Makefile.in
+++ orpie-1.5.1/Makefile.in
@@ -38,7 +38,7 @@
CURSES_LIB = @CURSES_LIB@
GSL_LIB = @GSL_LIB@
-INCLUDES = -I ./curses -I ./gsl -I ./units
+INCLUDES = -I ./curses -I /usr/lib/ocaml/gsl/ -I ./units
BFLAGS = -pp camlp4o -g $(INCLUDES) -thread
OFLAGS = -pp camlp4o $(INCLUDES) -thread
BLFLAGS = -custom -cclib '@LDFLAGS@ $(CURSES_LIB) $(GSL_LIB) -lm'
@@ -72,23 +72,25 @@
CURSES_BOBJS = $(CURSES_CMO) $(CURSES_COBJS)
CURSES_OOBJS = $(CURSES_CMX) $(CURSES_COBJS)
-GSL_CMO = gsl/gsl_error.cmo gsl/gsl_blas.cmo gsl/gsl_complex.cmo gsl/gsl_matrix.cmo gsl/gsl_matrix_complex.cmo \
- gsl/gsl_vector.cmo gsl/gsl_vector_complex.cmo gsl/gsl_vector_flat.cmo gsl/gsl_matrix_flat.cmo \
- gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \
- gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo
-GSL_CMX = $(GSL_CMO:.cmo=.cmx)
-GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o \
- gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_vector_double.o gsl/mlgsl_permut.o \
- gsl/mlgsl_linalg.o gsl/mlgsl_linalg_complex.o gsl/mlgsl_fun.o gsl/mlgsl_math.o gsl/mlgsl_sf.o
-GSL_BOBJS = $(GSL_COBJS) $(GSL_CMO)
-GSL_OOBJS = $(GSL_COBJS) $(GSL_CMX)
+#GSL_CMO = gsl/gsl_error.cmo gsl/gsl_blas.cmo gsl/gsl_complex.cmo gsl/gsl_matrix.cmo gsl/gsl_matrix_complex.cmo \
+# gsl/gsl_vector.cmo gsl/gsl_vector_complex.cmo gsl/gsl_vector_flat.cmo gsl/gsl_matrix_flat.cmo \
+# gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \
+# gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo
+#GSL_CMX = $(GSL_CMO:.cmo=.cmx)
+#GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o \
+# gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_vector_double.o gsl/mlgsl_permut.o \
+# gsl/mlgsl_linalg.o gsl/mlgsl_linalg_complex.o gsl/mlgsl_fun.o gsl/mlgsl_math.o gsl/mlgsl_sf.o
+#GSL_BOBJS = $(GSL_COBJS) $(GSL_CMO)
+#GSL_OOBJS = $(GSL_COBJS) $(GSL_CMX)
+GSL_BOBJS = /usr/lib/ocaml/gsl/gsl.cma
+GSL_OOBJS = /usr/lib/ocaml/gsl/gsl.cmxa
UNITS_CMO = units/units.cmo
UNITS_CMX = $(UNITS_CMO:.cmo=.cmx)
TEST_CMO = big_int_str.cmo gsl_assist.cmo install.cmo operations.cmo utility.cmo \
version.cmo rpc_stack.cmo add.cmo sub.cmo mult.cmo div.cmo inv.cmo pow.cmo \
- solvelin.cmo rpc_calc.cmo txtin_parser.cmo txtin_lexer.cmo calc_test.cmo
+ solvelin.cmo rpc_calc.cmo txtin_parser.cmo rcfile.cmo txtin_lexer.cmo calc_test.cmo
TEST_CMX = $(TEST_CMO:.cmo=.cmx)
GENERATED = version.ml
