summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-06-03 19:40:26 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-06-03 19:40:26 +0000
commite0f76404471f659ae360e5b2415ba34405e11cee (patch)
tree567edeae64b669e4820e9311bb555bde8f10f449 /sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
parentMasked games-simulation/secondlife (diff)
downloadhistorical-e0f76404471f659ae360e5b2415ba34405e11cee.tar.gz
historical-e0f76404471f659ae360e5b2415ba34405e11cee.tar.bz2
historical-e0f76404471f659ae360e5b2415ba34405e11cee.zip
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
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch')
-rw-r--r--sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch b/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
new file mode 100644
index 000000000000..45894f2039dc
--- /dev/null
+++ b/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
@@ -0,0 +1,30 @@
+--- Makefile.in.orig 2010-06-03 21:02:14.000000000 +0100
++++ Makefile.in 2010-06-03 21:02:49.000000000 +0100
+@@ -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,16 +72,8 @@
+ 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_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)