diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-04 22:20:07 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-04 22:20:07 +0000 |
| commit | 3fd8f741dee1fabf8f039978477ddf40186af857 (patch) | |
| tree | 7653e838f4222192f8fb34f21ac9202c06a3a224 /libtool/libtool-native_1.5.oe | |
| parent | 075e454dcb3d634ec9cc6f11281779201f12b508 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/04 18:19:53-04:00 local!kergoth
Libtool fixup pass 1:
Fix brokenness wrt shared libs on x86_64 (see ticket #29 in rt).
Kill the libtool.m4 -> acinclude.m4 madness.
Move the .m4's into an m4/ directory.
Let autotools.oeclass handle regenerating files, rather than calling libtool's script for it.
BKrev: 409817176nl9X1Mvw1iB4qnOQmAd4A
Diffstat (limited to 'libtool/libtool-native_1.5.oe')
| -rw-r--r-- | libtool/libtool-native_1.5.oe | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe index a2eaccac31..0d14be61fc 100644 --- a/libtool/libtool-native_1.5.oe +++ b/libtool/libtool-native_1.5.oe @@ -7,6 +7,7 @@ SRC_URI_append = " file://${FILESDIR}/libdir-la.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}" @@ -18,14 +19,14 @@ EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-" do_stage () { oe_runmake install install -d ${STAGING_DATADIR}/libtool \ - ${STAGING_DATADIR}/aclocal + ${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 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + 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 @@ -37,8 +38,8 @@ do_stage () { install -c config.guess ${CROSS_DATADIR}/libtool/config.guess install -c config.sub ${CROSS_DATADIR}/libtool/config.sub install -c -m 0644 ltmain.sh ${CROSS_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${CROSS_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 m4/libtool.m4 ${CROSS_DATADIR}/aclocal/ + install -c -m 0644 m4/ltdl.m4 ${CROSS_DATADIR}/aclocal/ } do_install () { |