diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-05-09 03:00:50 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-09 03:00:50 +0000 |
| commit | 2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635 (patch) | |
| tree | 0c0e1e2663501f3d271fb082f8fee20eb3fd0f38 /libtool | |
| parent | ea4f4c02e9679dfb2978f3d9a9042f2f7ed0ec08 (diff) | |
| download | openembedded-2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635.tar.gz | |
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/08 23:00:41-04:00 local!kergoth
Upgrade the alsa packages to 1.0.4.
2004/05/08 22:17:13-04:00 local!kergoth
Fix compile error with adns, resulting from a function definition not matching the declaration.
2004/05/08 18:00:51-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/08 13:59:20-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/08 13:59:15-04:00 local!kergoth
Fixing up the libtool-native/libtool-cross mess.
2004/05/08 13:59:04-04:00 local!kergoth
Bugfix in ncurses usage of oe_libinstall.
2004/05/07 21:46:16-04:00 local!kergoth
Merge
2004/05/07 21:45:26-04:00 local!kergoth
Adapt some .oe's to use oe_libinstall.
BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ
Diffstat (limited to 'libtool')
| -rw-r--r-- | libtool/libtool-cross_1.5.oe | 29 | ||||
| -rw-r--r-- | libtool/libtool-native_1.5.oe | 8 |
2 files changed, 9 insertions, 28 deletions
diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe index 6d5c4f36be..d8230bde51 100644 --- a/libtool/libtool-cross_1.5.oe +++ b/libtool/libtool-cross_1.5.oe @@ -1,6 +1,7 @@ include libtool_${PV}.oe -# This is a cross tool, but doesn't really fit in with the cross -# build system, so we don't actually "inherit cross" here. + +PACKAGES = "" +FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \ file://${FILESDIR}/sedvar.patch;patch=1 \ file://${FILESDIR}/tag.patch;patch=1 \ @@ -9,33 +10,17 @@ SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \ file://${FILESDIR}/ld.patch;patch=1 \ file://${FILESDIR}/chmod.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}" prefix = "${CROSS_DIR}" exec_prefix = "${prefix}" -EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-" - -PACKAGES = "" +do_compile () { +} do_stage () { - oe_runmake install - install -d ${STAGING_DATADIR}/libtool \ - ${STAGING_DATADIR}/aclocal - install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool - install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize - install -c config.guess ${STAGING_DATADIR}/libtool/config.guess - install -c config.sub ${STAGING_DATADIR}/libtool/config.sub - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ - - install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/ - install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la - oe_soinstall libltdl/.libs/libltdl.so.3.1.0 ${STAGING_LIBDIR}/ - install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ + install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool + install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool } do_install () { - : } diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe index 4f5eb57953..7014467e57 100644 --- a/libtool/libtool-native_1.5.oe +++ b/libtool/libtool-native_1.5.oe @@ -16,23 +16,19 @@ S = "${WORKDIR}/libtool-${PV}" prefix = "${CROSS_DIR}" exec_prefix = "${prefix}" -EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-" - do_stage () { oe_runmake install install -d ${STAGING_DATADIR}/libtool \ ${STAGING_DATADIR}/aclocal install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool - install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize + install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize install -c config.guess ${STAGING_DATADIR}/libtool/config.guess install -c config.sub ${STAGING_DATADIR}/libtool/config.sub install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ install -c -m 0644 m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ install -c -m 0644 m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ - install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/ - install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la - oe_soinstall libltdl/.libs/libltdl.so.3.1.0 ${STAGING_LIBDIR}/ + oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ install -d ${CROSS_DATADIR}/libtool/ |