[oe-commits] org.oe.dev merge of '44169e43f3a99ef5c64767fe8bdd3b86ecf0d55a'
pfalcon commit
openembedded-commits at lists.openembedded.org
Wed Jan 9 03:15:09 UTC 2008
merge of '44169e43f3a99ef5c64767fe8bdd3b86ecf0d55a'
and 'be5f46ae6a34db04f8dca3da7ad264ef4fc30e9e'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 9436278bfab53c9f4f3314ed68a3505a82c6e06e
ViewMTN: http://monotone.openembedded.org/revision/info/9436278bfab53c9f4f3314ed68a3505a82c6e06e
Files:
1
packages/nut
packages/nut/files
packages/nut/files/libm.patch
packages/nut/nut_2.2.1.bb
MAINTAINERS
conf/distro/openwrt-sdk.conf
packages/libtool/libtool-1.5.6
packages/libtool/libtool-1.5.6/autotools.patch
packages/libtool/libtool_1.5.6.bb
packages/octave/octave.inc
packages/octave/octave_2.1.73.bb
packages/octave/octave_2.9.19.bb
packages/octave/octave_3.0.0.bb
Diffs:
#
# mt diff -r44169e43f3a99ef5c64767fe8bdd3b86ecf0d55a -r9436278bfab53c9f4f3314ed68a3505a82c6e06e
#
#
#
# add_dir "packages/nut"
#
# add_dir "packages/nut/files"
#
# add_file "packages/nut/files/libm.patch"
# content [11bc3fc336a2fd0e75104921916b615dcf31279c]
#
# add_file "packages/nut/nut_2.2.1.bb"
# content [00d9e22eefd7c427d126869ec2ad17cafc671a0f]
#
# patch "MAINTAINERS"
# from [8be8b1832f42218d3cc6ae809b61dc80fcd70003]
# to [8c59ce00f263c54ebc989a744a0d0538115e6075]
#
# patch "conf/distro/openwrt-sdk.conf"
# from [8b396941add259495d68102ab8ff2429a211f943]
# to [1107f0f69397f0e0bf38f74a1414c0ec52f30efe]
#
============================================================
--- packages/nut/files/libm.patch 11bc3fc336a2fd0e75104921916b615dcf31279c
+++ packages/nut/files/libm.patch 11bc3fc336a2fd0e75104921916b615dcf31279c
@@ -0,0 +1,21 @@
+--- a/drivers/Makefile.am.org 2007-10-01 16:06:24.000000000 +0300
++++ a/drivers/Makefile.am 2008-01-09 02:13:09.000000000 +0200
+@@ -125,7 +125,7 @@
+ tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm
+
+ bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c nut_usb.c
+-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS)
++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm
+
+ megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c
+ megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV
+--- a/drivers/Makefile.am.org 2008-01-09 02:14:32.000000000 +0200
++++ a/drivers/Makefile.am 2008-01-09 02:17:37.000000000 +0200
+@@ -67,6 +67,7 @@
+ al175_SOURCES = al175.c
+ apcsmart_SOURCES = apcsmart.c
+ bcmxcp_SOURCES = bcmxcp.c bcmxcp_ser.c
++bcmxcp_LDADD = $(LDADD) -lm
+ belkin_SOURCES = belkin.c
+ belkinunv_SOURCES = belkinunv.c
+ bestfcom_SOURCES = bestfcom.c
============================================================
--- packages/nut/nut_2.2.1.bb 00d9e22eefd7c427d126869ec2ad17cafc671a0f
+++ packages/nut/nut_2.2.1.bb 00d9e22eefd7c427d126869ec2ad17cafc671a0f
@@ -0,0 +1,14 @@
+DESCRIPTION = "Network UPS Tools"
+LICENSE = "GPL"
+DEPENDS = "libusb"
+PR = "r1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-usb"
+
+SRC_URI = "http://www.networkupstools.org/source/2.2/nut-${PV}.tar.gz \
+ file://libm.patch;patch=1 \
+ "
+
+FILES_${PN} += "${datadir}/"
============================================================
--- MAINTAINERS 8be8b1832f42218d3cc6ae809b61dc80fcd70003
+++ MAINTAINERS 8c59ce00f263c54ebc989a744a0d0538115e6075
@@ -162,7 +162,7 @@ Interests: Cross-machine unification
Machines: h3900, h4000, hx4700
Interests: PocketPC and Palm devices support, Win32 support
Interests: Cross-machine unification
-Recipes: linux-handhelds-2.6, opie-*
+Recipes: linux-handhelds-2.6, opie-*, initramfs-*, gnome-mplayer
Person: Philip Balister
Mail: Crofton at balister.org
============================================================
--- conf/distro/openwrt-sdk.conf 8b396941add259495d68102ab8ff2429a211f943
+++ conf/distro/openwrt-sdk.conf 1107f0f69397f0e0bf38f74a1414c0ec52f30efe
@@ -18,9 +18,12 @@ DISTRO_NAME = "OpenWRT"
# Header
#
DISTRO_NAME = "OpenWRT"
+DISTRO_REVISION = "2"
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
+
# This is what lives in SDK
ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
# Make sure that we have correct package dependencies for SDK-provided libs.
+ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
-ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc"
#
# mt diff -rbe5f46ae6a34db04f8dca3da7ad264ef4fc30e9e -r9436278bfab53c9f4f3314ed68a3505a82c6e06e
#
#
#
# add_dir "packages/libtool/libtool-1.5.6"
#
# add_file "packages/libtool/libtool-1.5.6/autotools.patch"
# content [0bdcb8d07a1b7084551fcd631089b69e4e22ce7b]
#
# add_file "packages/libtool/libtool_1.5.6.bb"
# content [7fa24606e1c058e0d3134af5de7e5ef159335592]
#
# patch "packages/octave/octave.inc"
# from [ee444b2bd09390c3cf0f543fd839457a3a0fb8c3]
# to [2624086bdfb34c85b43593497c19f150d08efa5e]
#
# patch "packages/octave/octave_2.1.73.bb"
# from [028ace8fc5a864067196732b53fb3568c0000830]
# to [ea37fd6f98c2207c29011aaeeae902f8b1c976dc]
#
# patch "packages/octave/octave_2.9.19.bb"
# from [fd814dd8dc7d4aed94aeda8148c85861039e1b40]
# to [8a24462904742811705f1ac39ca11ba7f25b275b]
#
# patch "packages/octave/octave_3.0.0.bb"
# from [fd814dd8dc7d4aed94aeda8148c85861039e1b40]
# to [8a24462904742811705f1ac39ca11ba7f25b275b]
#
============================================================
--- packages/libtool/libtool-1.5.6/autotools.patch 0bdcb8d07a1b7084551fcd631089b69e4e22ce7b
+++ packages/libtool/libtool-1.5.6/autotools.patch 0bdcb8d07a1b7084551fcd631089b69e4e22ce7b
@@ -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 at 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 at 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 at 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 at 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 at 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 at 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 at gnu.org])
+ AC_CONFIG_SRCDIR([foo.cpp])
++AC_CONFIG_AUX_DIR([..])
+
+ AC_CANONICAL_TARGET
+
============================================================
--- packages/libtool/libtool_1.5.6.bb 7fa24606e1c058e0d3134af5de7e5ef159335592
+++ packages/libtool/libtool_1.5.6.bb 7fa24606e1c058e0d3134af5de7e5ef159335592
@@ -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}/
+}
============================================================
--- packages/octave/octave.inc ee444b2bd09390c3cf0f543fd839457a3a0fb8c3
+++ packages/octave/octave.inc 2624086bdfb34c85b43593497c19f150d08efa5e
@@ -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,8 +8,12 @@ inherit autotools
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
oe_runconf
@@ -26,4 +27,3 @@ do_stage() {
do_stage() {
autotools_stage_all
}
-
============================================================
--- packages/octave/octave_2.1.73.bb 028ace8fc5a864067196732b53fb3568c0000830
+++ packages/octave/octave_2.1.73.bb ea37fd6f98c2207c29011aaeeae902f8b1c976dc
@@ -1,8 +1,8 @@ SRC_URI = "ftp://ftp.octave.org/pub/octa
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"
============================================================
--- packages/octave/octave_2.9.19.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
+++ packages/octave/octave_2.9.19.bb 8a24462904742811705f1ac39ca11ba7f25b275b
@@ -1,24 +1,24 @@ SRC_URI = "ftp://ftp.octave.org/pub/octa
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
============================================================
--- packages/octave/octave_3.0.0.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
+++ packages/octave/octave_3.0.0.bb 8a24462904742811705f1ac39ca11ba7f25b275b
@@ -1,24 +1,24 @@ SRC_URI = "ftp://ftp.octave.org/pub/octa
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
More information about the Openembedded-commits
mailing list