diff options
| -rw-r--r-- | libtool/libtool-1.5/ld.patch | 0 | ||||
| -rw-r--r-- | libtool/libtool-1.5/m4.patch | 0 | ||||
| -rw-r--r-- | libtool/libtool-1.5/prefix.patch | 26 | ||||
| -rw-r--r-- | libtool/libtool-cross_1.5.oe | 16 | ||||
| -rw-r--r-- | libtool/libtool-native_1.5.oe | 11 | ||||
| -rw-r--r-- | libtool/libtool_1.5.oe | 5 |
6 files changed, 42 insertions, 16 deletions
diff --git a/libtool/libtool-1.5/ld.patch b/libtool/libtool-1.5/ld.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5/ld.patch diff --git a/libtool/libtool-1.5/m4.patch b/libtool/libtool-1.5/m4.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5/m4.patch diff --git a/libtool/libtool-1.5/prefix.patch b/libtool/libtool-1.5/prefix.patch index e69de29bb2..066431d4d1 100644 --- a/libtool/libtool-1.5/prefix.patch +++ b/libtool/libtool-1.5/prefix.patch @@ -0,0 +1,26 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libtool-1.5/m4/libtool.m4~prefix ++++ libtool-1.5/m4/libtool.m4 +@@ -82,7 +82,8 @@ + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)' ++LIBTOOL="$LIBTOOL/$host_alias-libtool" + AC_SUBST(LIBTOOL)dnl + + # Prevent multiple expansion +@@ -149,7 +150,7 @@ + rm="rm -f" + + # Global variables: +-default_ofile=libtool ++default_ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except M$VC, diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe index d9004eb718..6d5c4f36be 100644 --- a/libtool/libtool-cross_1.5.oe +++ b/libtool/libtool-cross_1.5.oe @@ -2,12 +2,12 @@ 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. 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}/chmod.patch;patch=1 \ - file://${FILESDIR}/install-path-check.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}" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}" @@ -27,8 +27,8 @@ do_stage () { 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 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 () { diff --git a/libtool/libtool_1.5.oe b/libtool/libtool_1.5.oe index 33cfbbb98b..9d825b5585 100644 --- a/libtool/libtool_1.5.oe +++ b/libtool/libtool_1.5.oe @@ -4,11 +4,10 @@ the complexity of generating special library types (such as shared \ 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}/libtool15-update-configscripts.patch;patch=1;pnum=1" S = "${WORKDIR}/libtool-${PV}" inherit autotools -do_configure_prepend () { - ./bootstrap -} +acpaths = "-I ${S}/m4" |