diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/libtool/libtool-1.5.6/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/libtool/libtool-1.5.6/autotools.patch | 127 | ||||
-rw-r--r-- | packages/libtool/libtool_1.5.6.bb | 38 | ||||
-rw-r--r-- | packages/octave/octave.inc | 12 | ||||
-rw-r--r-- | packages/octave/octave_2.1.73.bb | 2 | ||||
-rw-r--r-- | packages/octave/octave_2.9.19.bb | 14 | ||||
-rw-r--r-- | packages/octave/octave_3.0.0.bb | 14 |
7 files changed, 186 insertions, 21 deletions
diff --git a/packages/libtool/libtool-1.5.6/.mtn2git_empty b/packages/libtool/libtool-1.5.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libtool/libtool-1.5.6/.mtn2git_empty diff --git a/packages/libtool/libtool-1.5.6/autotools.patch b/packages/libtool/libtool-1.5.6/autotools.patch new file mode 100644 index 0000000000..5df441e945 --- /dev/null +++ b/packages/libtool/libtool-1.5.6/autotools.patch @@ -0,0 +1,127 @@ +diff -urNd -urNd libtool-1.5/cdemo/configure.ac libtool-1.5.ac/cdemo/configure.ac +--- libtool-1.5/cdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400 ++++ libtool-1.5.ac/cdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400 +@@ -24,6 +24,7 @@ + ## ------------------------ ## + AC_INIT([cdemo], [0.1], [bug-libtool@gnu.org]) + AC_CONFIG_SRCDIR([main.c]) ++AC_CONFIG_AUX_DIR([..]) + + + ## ------------------------ ## +diff -urNd -urNd libtool-1.5/demo/configure.ac libtool-1.5.ac/demo/configure.ac +--- libtool-1.5/demo/configure.ac 2002-03-02 22:19:55.000000000 -0500 ++++ libtool-1.5.ac/demo/configure.ac 2004-05-05 17:16:17.000000000 -0400 +@@ -24,6 +24,7 @@ + ## ------------------------ ## + AC_INIT([demo], [1.0], [bug-libtool@gnu.org]) + AC_CONFIG_SRCDIR([hello.c]) ++AC_CONFIG_AUX_DIR([..]) + + + ## ------------------------ ## +diff -urNd -urNd libtool-1.5/demo/Makefile.am libtool-1.5.ac/demo/Makefile.am +--- libtool-1.5/demo/Makefile.am 2002-11-19 04:42:39.000000000 -0500 ++++ libtool-1.5.ac/demo/Makefile.am 2004-05-05 17:17:34.000000000 -0400 +@@ -121,17 +121,16 @@ + + # This is one of the essential tests for deplibs_check_method=pass_all. + # If this one passes with pass_all, it is likely that pass_all works +-EXTRA_LIBRARIES = libhell0.a +-libhell0_a_SOURCES = hello.c foo.c +-EXTRA_LTLIBRARIES = libhell1.la libhell2.la ++EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la ++libhell0_la_SOURCES = hello.c foo.c + libhell1_la_SOURCES = hell1.c + libhell1_la_LIBADD = -L. -lhell0 + libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir) +-libhell1_la_DEPENDENCIES = libhell0.a ++libhell1_la_DEPENDENCIES = libhell0.la + libhell2_la_SOURCES = hell2.c + libhell2_la_LIBADD = -L. -lhell0 + libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir) +-libhell2_la_DEPENDENCIES = libhell0.a ++libhell2_la_DEPENDENCIES = libhell0.la + EXTRA_PROGRAMS = hell0 + hell0_SOURCES = main.c + hell0_LDADD = libhell1.la libhell2.la $(LIBM) +diff -urNd -urNd libtool-1.5/depdemo/configure.ac libtool-1.5.ac/depdemo/configure.ac +--- libtool-1.5/depdemo/configure.ac 2002-10-22 15:29:28.000000000 -0400 ++++ libtool-1.5.ac/depdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400 +@@ -24,6 +24,7 @@ + ## ------------------------ ## + AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org]) + AC_CONFIG_SRCDIR([main.c]) ++AC_CONFIG_AUX_DIR([..]) + + + ## ------------------------ ## +diff -urNd -urNd libtool-1.5/f77demo/configure.ac libtool-1.5.ac/f77demo/configure.ac +--- libtool-1.5/f77demo/configure.ac 2003-03-22 01:34:27.000000000 -0500 ++++ libtool-1.5.ac/f77demo/configure.ac 2004-05-05 17:16:17.000000000 -0400 +@@ -23,6 +23,7 @@ + ## ------------------------ ## + AC_INIT([f77demo], [0.1], [bug-libtool@gnu.org]) + AC_CONFIG_SRCDIR([foof.f])dnl ++AC_CONFIG_AUX_DIR([..]) + + ## ------------------------ ## + ## Automake Initialisation. ## +diff -urNd -urNd libtool-1.5/mdemo/configure.ac libtool-1.5.ac/mdemo/configure.ac +--- libtool-1.5/mdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400 ++++ libtool-1.5.ac/mdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400 +@@ -24,6 +24,7 @@ + ## ------------------------ ## + AC_INIT([mdemo], [0.1], [bug-libtool@gnu.org]) + AC_CONFIG_SRCDIR([main.c]) ++AC_CONFIG_AUX_DIR([..]) + + + ## ------------------------ ## +diff -urNd -urNd libtool-1.5/pdemo/configure.ac libtool-1.5.ac/pdemo/configure.ac +--- libtool-1.5/pdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400 ++++ libtool-1.5.ac/pdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400 +@@ -24,6 +24,7 @@ + ## ------------------------ ## + AC_INIT([pdemo], [0.1], [bug-libtool@gnu.org]) + AC_CONFIG_SRCDIR([longer_file_name_hello.c]) ++AC_CONFIG_AUX_DIR([..]) + + + ## ------------------------ ## +diff -urNd -urNd libtool-1.5/pdemo/Makefile.am libtool-1.5.ac/pdemo/Makefile.am +--- libtool-1.5/pdemo/Makefile.am 2002-11-19 04:42:39.000000000 -0500 ++++ libtool-1.5.ac/pdemo/Makefile.am 2004-05-05 17:17:59.000000000 -0400 +@@ -121,17 +121,16 @@ + + # This is one of the essential tests for deplibs_check_method=pass_all. + # If this one passes with pass_all, it is likely that pass_all works +-EXTRA_LIBRARIES = libhell0.a +-libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c +-EXTRA_LTLIBRARIES = libhell1.la libhell2.la ++libhell0_la_SOURCES = longer_file_name_hello.c longer_file_name_foo.c ++EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la + libhell1_la_SOURCES = longer_file_name_hell1.c + libhell1_la_LIBADD = -L. -lhell0 + libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir) +-libhell1_la_DEPENDENCIES = libhell0.a ++libhell1_la_DEPENDENCIES = libhell0.la + libhell2_la_SOURCES = longer_file_name_hell2.c + libhell2_la_LIBADD = -L. -lhell0 + libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir) +-libhell2_la_DEPENDENCIES = libhell0.a ++libhell2_la_DEPENDENCIES = libhell0.la + EXTRA_PROGRAMS = hell0 + hell0_SOURCES = longer_file_name_main.c + hell0_LDADD = libhell1.la libhell2.la $(LIBM) +diff -urNd -urNd libtool-1.5/tagdemo/configure.ac libtool-1.5.ac/tagdemo/configure.ac +--- libtool-1.5/tagdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400 ++++ libtool-1.5.ac/tagdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400 +@@ -24,6 +24,7 @@ + ## ------------------------ ## + AC_INIT([tagdemo], [0.1], [bug-libtool@gnu.org]) + AC_CONFIG_SRCDIR([foo.cpp]) ++AC_CONFIG_AUX_DIR([..]) + + AC_CANONICAL_TARGET + diff --git a/packages/libtool/libtool_1.5.6.bb b/packages/libtool/libtool_1.5.6.bb new file mode 100644 index 0000000000..2deb7df15c --- /dev/null +++ b/packages/libtool/libtool_1.5.6.bb @@ -0,0 +1,38 @@ +# Exists for compatibility with certain distributions (e.g. Maemo). + +DESCRIPTION = "Generic library support script \ +This is GNU libtool, a generic library support script. Libtool hides \ +the complexity of generating special library types (such as shared \ +libraries) behind a consistent interface." +HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" +LICENSE = "GPL" +SECTION = "devel" +PR = "r2" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ + file://autotools.patch;patch=1" +S = "${WORKDIR}/libtool-${PV}" + +PACKAGES = "libltdl libltdl-dbg libltdl-dev ${PN} ${PN}-doc" +FILES_${PN} += "${datadir}/aclocal*" +FILES_libltdl = "${libdir}/libltdl.so.*" +FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" +FILES_libltdl-dbg = "${libdir}/.debug/" + +inherit autotools + +EXTRA_AUTORECONF = "--exclude=libtoolize" + +do_configure () { + find ${S} -name acinclude.m4 | for m4 in `cat`; do + cat ${S}/libtool.m4 ${S}/ltdl.m4 > $m4 + done + autotools_do_configure +} + +do_stage () { + oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} + install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ +} diff --git a/packages/octave/octave.inc b/packages/octave/octave.inc index 414f95bf83..5d8fe756f9 100644 --- a/packages/octave/octave.inc +++ b/packages/octave/octave.inc @@ -1,7 +1,4 @@ -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." +DESCRIPTION = "Matlab alternative for numerical computations" HOMEPAGE = "http://www.gnu.org/software/octave/" SECTION = "console/scientific" LICENSE = "GPL" @@ -11,7 +8,11 @@ RDEPENDS = "libfftw3" inherit autotools -EXTRA_OECONF = "--without-hdf5" +EXTRA_OECONF = "--without-hdf5 --without-glpk -without-umfpack \ + --without-colamd --without-ccolamd --without-cholmod \ + --without-cxsparse" + +# additional missing dependency/functionality: Qhull gperf do_configure() { gnu-configize @@ -26,4 +27,3 @@ 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 index a6bf240732..8efe5243d7 100644 --- a/packages/octave/octave_2.1.73.bb +++ b/packages/octave/octave_2.1.73.bb @@ -2,7 +2,7 @@ require octave.inc SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz" -PR = "r0" +PR = "r1" PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev" diff --git a/packages/octave/octave_2.9.19.bb b/packages/octave/octave_2.9.19.bb index b92a181754..3b56c8657d 100644 --- a/packages/octave/octave_2.9.19.bb +++ b/packages/octave/octave_2.9.19.bb @@ -3,22 +3,22 @@ require octave.inc SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ file://configure.patch;patch=1" -PR = "r0" +PR = "r1" 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 = "${libdir}/${PN}-${PV}/libcruft.so.*" +FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*" FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" -FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" -FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so.*" +FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*" FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" -FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" -FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so.*" +FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*" FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" # octave-oct provides subroutines in .oct file format diff --git a/packages/octave/octave_3.0.0.bb b/packages/octave/octave_3.0.0.bb index b92a181754..3b56c8657d 100644 --- a/packages/octave/octave_3.0.0.bb +++ b/packages/octave/octave_3.0.0.bb @@ -3,22 +3,22 @@ require octave.inc SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ file://configure.patch;patch=1" -PR = "r0" +PR = "r1" 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 = "${libdir}/${PN}-${PV}/libcruft.so.*" +FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*" FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" -FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" -FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so.*" +FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*" FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" -FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" -FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so.*" +FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*" FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" # octave-oct provides subroutines in .oct file format |