diff options
Diffstat (limited to 'packages/libtool')
| -rw-r--r-- | packages/libtool/libtool-cross_1.5.22.bb | 8 | ||||
| -rw-r--r-- | packages/libtool/libtool-native_1.5.22.bb | 24 |
2 files changed, 14 insertions, 18 deletions
diff --git a/packages/libtool/libtool-cross_1.5.22.bb b/packages/libtool/libtool-cross_1.5.22.bb index 2188963495..df49dc8886 100644 --- a/packages/libtool/libtool-cross_1.5.22.bb +++ b/packages/libtool/libtool-cross_1.5.22.bb @@ -10,6 +10,7 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://prefix.patch;patch=1 \ file://tag.patch;patch=1 \ file://tag1.patch;patch=1 \ + file://rpath.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" @@ -23,6 +24,13 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool + install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + 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/ } do_install () { diff --git a/packages/libtool/libtool-native_1.5.22.bb b/packages/libtool/libtool-native_1.5.22.bb index 35d7f40b09..dec4bf1e14 100644 --- a/packages/libtool/libtool-native_1.5.22.bb +++ b/packages/libtool/libtool-native_1.5.22.bb @@ -12,8 +12,6 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -STAGING_DATADIR_safe := "${STAGING_DATADIR}" - inherit native do_stage () { @@ -21,22 +19,12 @@ do_stage () { install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - for dir in ${STAGING_DATADIR} ${STAGING_DATADIR_safe}; do - ltdldir="${dir}/libtool/libltdl" - install -d $dir/libtool \ - $ltdldir \ - $dir/aclocal - install -c config.guess $dir/libtool/config.guess - install -c config.sub $dir/libtool/config.sub - install -c -m 0644 ltmain.sh $dir/libtool/ - install -c -m 0644 libtool.m4 $dir/aclocal/ - install -c -m 0644 ltdl.m4 $dir/aclocal/ - - for src in README COPYING.LIB Makefile.am configure.ac \ - config-h.in ltdl.c ltdl.h; do - install -m 0644 libltdl/${src} ${ltdldir} - done - done + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + 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/ } do_install () { |