From 65fe7a50164012f345b5dc1a5ebffa24e40dde92 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 21 Nov 2007 08:04:43 +0000 Subject: fftw: add RPROVIDES libfftw3 --- packages/fftw/fftw.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fftw/fftw.inc b/packages/fftw/fftw.inc index 88c946b1d4..acd1b27f4b 100644 --- a/packages/fftw/fftw.inc +++ b/packages/fftw/fftw.inc @@ -2,6 +2,7 @@ DESCRIPTION = "FFTW" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" +RPROVIDES += "libfftw3" PR = "r1" -- cgit v1.2.3 From c690d0aa1271976295342130e104f37660ee10e3 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 21 Nov 2007 08:52:51 +0000 Subject: octave: add buidable stable 2.1.73 and testing 2.9.17 --- MAINTAINERS | 2 +- packages/octave/files/.mtn2git_empty | 0 packages/octave/files/configure.patch | 15 +++++++++++++++ packages/octave/octave.inc | 29 +++++++++++++++++++++++++++++ packages/octave/octave_2.1.71.bb | 17 ----------------- packages/octave/octave_2.1.73.bb | 11 +++++++++++ packages/octave/octave_2.9.17.bb | 27 +++++++++++++++++++++++++++ 7 files changed, 83 insertions(+), 18 deletions(-) create mode 100644 packages/octave/files/.mtn2git_empty create mode 100644 packages/octave/files/configure.patch create mode 100644 packages/octave/octave.inc delete mode 100644 packages/octave/octave_2.1.71.bb create mode 100644 packages/octave/octave_2.1.73.bb create mode 100644 packages/octave/octave_2.9.17.bb diff --git a/MAINTAINERS b/MAINTAINERS index 0b039beeea..53c4380116 100644 --- 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 index 0000000000..e69de29bb2 diff --git a/packages/octave/files/configure.patch b/packages/octave/files/configure.patch new file mode 100644 index 0000000000..f94e5ae8c0 --- /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.inc b/packages/octave/octave.inc new file mode 100644 index 0000000000..414f95bf83 --- /dev/null +++ b/packages/octave/octave.inc @@ -0,0 +1,29 @@ +DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \ +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." +HOMEPAGE = "http://www.gnu.org/software/octave/" +SECTION = "console/scientific" +LICENSE = "GPL" +DEPENDS = "readline ncurses fftw" +RDEPENDS = "libfftw3" +# fftw compiled with --disable-fortran + +inherit autotools + +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.71.bb b/packages/octave/octave_2.1.71.bb deleted file mode 100644 index 22c4d69393..0000000000 --- a/packages/octave/octave_2.1.71.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \ -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" -LICENSE = "GPL" -DEPENDS = "readline ncurses" -SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz" - -inherit autotools - -FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a" - -do_configure() { - gnu-configize - oe_runconf -} diff --git a/packages/octave/octave_2.1.73.bb b/packages/octave/octave_2.1.73.bb new file mode 100644 index 0000000000..a6bf240732 --- /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 index 0000000000..5473e0d99e --- /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" -- cgit v1.2.3 From 220023a1bd25f3f3e81e89e56b1e707fe1e29949 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 21 Nov 2007 09:03:05 +0000 Subject: gcc-(cross)_4.1.2: enable gfortran and gfortran packaging --- packages/gcc/gcc-package.inc | 8 ++++++++ packages/gcc/gcc3-build.inc | 2 +- packages/gcc/gcc_4.1.2.bb | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 82bf78db80..1eee631e33 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -5,6 +5,7 @@ PACKAGES = "libgcc ${PN} ${PN}-symlinks \ g++ g++-symlinks \ cpp cpp-symlinks \ g77 g77-symlinks \ + gfortran gfortran-symlinks \ gcov gcov-symlinks \ libmudflap libmudflap-dev \ libstdc++ libg2c \ @@ -28,6 +29,11 @@ FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \ FILES_g77-symlinks = "${bindir}/g77 \ ${bindir}/f77" +FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951" +FILES_gfortran-symlinks = "${bindir}/gfortran \ + ${bindir}/f95" + FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \ ${base_libdir}/cpp" FILES_cpp-symlinks = "${bindir}/cpp" @@ -115,9 +121,11 @@ do_install () { # Symlinks so we can use these trivially on the target ln -sf ${TARGET_SYS}-g77 g77 + ln -sf ${TARGET_SYS}-gfortran gfortran ln -sf ${TARGET_SYS}-g++ g++ ln -sf ${TARGET_SYS}-gcc gcc ln -sf g77 f77 + ln -sf gfortran f95 ln -sf g++ c++ ln -sf gcc cc ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 2924f0f9dd..bb48f7b099 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -16,7 +16,7 @@ JAVA_arm ?= "" JAVA_armeb ?= "" JAVA_mipsel ?= "" JAVA_sh3 ?= "" -# gcc4-build sets this to f95 +# gcc4-build sets this to fortran FORTRAN ?= ",f77" LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 0f8cfa46b4..719379c805 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -39,6 +39,7 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " #Set the fortran bits # ',fortran' or '', not 'f77' like gcc3 had FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" #Set the java bits JAVA = "" -- cgit v1.2.3