diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-10 00:52:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-10 00:52:47 +0000 |
| commit | cb2f160c0ebcbf8421988e7ee9818e007e085305 (patch) | |
| tree | 7b25aca42bcde8335efe58709261da5ca5504f70 /libtool | |
| parent | e18dbb2be3143c54092ca6025161cbc750990b0a (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/09 20:52:43-04:00 local!kergoth
Libtool updates, no longer directly inherit libtool.
2004/05/09 20:52:08-04:00 local!kergoth
Update libtool bits. libtoolize no longer requires a runtime STAGING_DIR var set.
BKrev: 409ed25fQy7BIGJH5qwdtr0BClqFVw
Diffstat (limited to 'libtool')
| -rw-r--r-- | libtool/libtool-1.5/libtoolize-staging.patch | 0 | ||||
| -rw-r--r-- | libtool/libtool-cross_1.5.oe | 4 | ||||
| -rw-r--r-- | libtool/libtool-native_1.5.oe | 1 | ||||
| -rw-r--r-- | libtool/libtool_1.5.oe | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/libtool/libtool-1.5/libtoolize-staging.patch b/libtool/libtool-1.5/libtoolize-staging.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/libtool/libtool-1.5/libtoolize-staging.patch +++ /dev/null diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe index 4aed5a34d4..9d52fe00c3 100644 --- a/libtool/libtool-cross_1.5.oe +++ b/libtool/libtool-cross_1.5.oe @@ -5,21 +5,17 @@ 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 \ - file://${FILESDIR}/libtoolize-staging.patch;patch=1 \ file://${FILESDIR}/prefix.patch;patch=1 \ file://${FILESDIR}/ld.patch;patch=1 \ file://${FILESDIR}/chmod.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -# This should match what native.oeclass does prefix = "${STAGING_DIR}" -exec_prefix = "${prefix}/${BUILD_SYS}" do_compile () { } do_stage () { - install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool } diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe index a34b8d43ad..252167622a 100644 --- a/libtool/libtool-native_1.5.oe +++ b/libtool/libtool-native_1.5.oe @@ -6,7 +6,6 @@ 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 \ - file://${FILESDIR}/libtoolize-staging.patch;patch=1 \ file://${FILESDIR}/prefix.patch;patch=1 \ file://${FILESDIR}/ld.patch;patch=1 \ file://${FILESDIR}/chmod.patch;patch=1 \ diff --git a/libtool/libtool_1.5.oe b/libtool/libtool_1.5.oe index f01d973180..112d984b96 100644 --- a/libtool/libtool_1.5.oe +++ b/libtool/libtool_1.5.oe @@ -6,7 +6,8 @@ libraries) behind a consistent interface." SRC_URI = "http://ftp.club.cc.cmu.edu/pub/gnu/libtool/libtool-${PV}.tar.gz \ file://${FILESDIR}/m4.patch;patch=1 \ file://${FILESDIR}/autotools.patch;patch=1 \ - file://${FILESDIR}/libtool15-update-configscripts.patch;patch=1;pnum=1" + file://${FILESDIR}/prefix.patch;patch=1 \ + file://${FILESDIR}/libtool15-update-configscripts.patch;patch=1;pnum=1" S = "${WORKDIR}/libtool-${PV}" inherit autotools |