octave: add buidable stable 2.1.73 and testing 2.9.17

diff --git a/MAINTAINERS b/MAINTAINERS
index 0b039be..53c4380 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -94,7 +94,7 @@ Person:     Junqian Gordon Xu 'xjqian'
 Mail:       xjqian@gmail.com
 Machines:   tosa, borzoi, nokia770
 Distros:    Ångström
-Recipes:    gnuplot
+Recipes:    gnuplot octave
 
 Person:     Justin Patrin
 Mail:       papercrane@reversefold.com

diff --git a/packages/octave/files/.mtn2git_empty b/packages/octave/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/octave/files/configure.patch b/packages/octave/files/configure.patch
new file mode 100644 (file)
index 0000000..f94e5ae
--- /dev/null
+++ b/packages/octave/files/configure.patch
@@ -0,0 +1,15 @@
+--- octave-2.9.17/configure.old        2007-11-17 18:57:35.000000000 -0600
++++ octave-2.9.17/configure    2007-11-17 19:08:33.000000000 -0600
+@@ -22598,11 +22598,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++  { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */

diff --git a/packages/octave/octave_2.1.71.bb b/packages/octave/octave.inc
similarity index 54%
rename from packages/octave/octave_2.1.71.bb
rename to packages/octave/octave.inc
index 22c4d69..414f95b 100644 (file)
--- a/packages/octave/octave_2.1.71.bb
+++ b/packages/octave/octave.inc
@@ -2,16 +2,28 @@ DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numer
 It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
 and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
 It may also be used as a batch-oriented language."
-SECTION = "console/utils"
+HOMEPAGE = "http://www.gnu.org/software/octave/"
+SECTION = "console/scientific"
 LICENSE = "GPL"
-DEPENDS = "readline ncurses"
-SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
+DEPENDS = "readline ncurses fftw"
+RDEPENDS = "libfftw3"
+# fftw compiled with --disable-fortran
 
 inherit autotools
 
-FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a"
+EXTRA_OECONF = "--without-hdf5"
 
 do_configure() {
        gnu-configize
        oe_runconf
 }
+
+PACKAGES =+ "octave-m"
+
+# octave-m provides matlab routines in .m file format
+FILES_${PN}-m = "${datadir}/${PN}/*"
+
+do_stage() {
+        autotools_stage_all
+}
+

diff --git a/packages/octave/octave_2.1.73.bb b/packages/octave/octave_2.1.73.bb
new file mode 100644 (file)
index 0000000..a6bf240
--- /dev/null
+++ b/packages/octave/octave_2.1.73.bb
@@ -0,0 +1,11 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
+
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"

diff --git a/packages/octave/octave_2.9.17.bb b/packages/octave/octave_2.9.17.bb
new file mode 100644 (file)
index 0000000..5473e0d
--- /dev/null
+++ b/packages/octave/octave_2.9.17.bb
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+            libcruft-dev liboctave-dev liboctinterp-dev \
+             libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"