diff options
-rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
-rw-r--r-- | libtool/libtool-1.5.6/autotools.patch | 0 | ||||
-rw-r--r-- | libtool/libtool-1.5.6/install-path-check.patch | 0 | ||||
-rw-r--r-- | libtool/libtool-1.5.6/libdir-la.patch | 0 | ||||
-rw-r--r-- | libtool/libtool-1.5.6/prefix.patch | 0 | ||||
-rw-r--r-- | libtool/libtool-1.5.6/sedvar.patch | 0 | ||||
-rw-r--r-- | libtool/libtool-1.5.6/tag.patch | 0 | ||||
-rw-r--r-- | libtool/libtool-cross_1.5.6.oe | 6 | ||||
-rw-r--r-- | libtool/libtool-cross_1.5.oe | 23 | ||||
-rw-r--r-- | libtool/libtool-native_1.5.6.oe | 17 | ||||
-rw-r--r-- | libtool/libtool-native_1.5.oe | 34 | ||||
-rw-r--r-- | libtool/libtool_1.5.6.oe | 1 | ||||
-rw-r--r-- | libtool/libtool_1.5.oe | 12 |
13 files changed, 18 insertions, 76 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 4fd72560f2..54486033cf 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -13,6 +13,7 @@ kebert@geralt.doma kergoth@direwolf.(none) kergoth@direwolf.itg.ti.com kergoth@direwolf.ppp.ti.com +kergoth@hyperion.(none) kergoth@linux.local kergoth@nexus.(none) kergoth@odin.(none) diff --git a/libtool/libtool-1.5.6/autotools.patch b/libtool/libtool-1.5.6/autotools.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5.6/autotools.patch diff --git a/libtool/libtool-1.5.6/install-path-check.patch b/libtool/libtool-1.5.6/install-path-check.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5.6/install-path-check.patch diff --git a/libtool/libtool-1.5.6/libdir-la.patch b/libtool/libtool-1.5.6/libdir-la.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5.6/libdir-la.patch diff --git a/libtool/libtool-1.5.6/prefix.patch b/libtool/libtool-1.5.6/prefix.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5.6/prefix.patch diff --git a/libtool/libtool-1.5.6/sedvar.patch b/libtool/libtool-1.5.6/sedvar.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5.6/sedvar.patch diff --git a/libtool/libtool-1.5.6/tag.patch b/libtool/libtool-1.5.6/tag.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libtool/libtool-1.5.6/tag.patch diff --git a/libtool/libtool-cross_1.5.6.oe b/libtool/libtool-cross_1.5.6.oe index d071c9575c..141ee916ef 100644 --- a/libtool/libtool-cross_1.5.6.oe +++ b/libtool/libtool-cross_1.5.6.oe @@ -3,10 +3,8 @@ include libtool_${PV}.oe 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 \ - file://${FILESDIR}/ld.patch;patch=1 \ - file://${FILESDIR}/chmod.patch;patch=1" + file://${FILESDIR}/prefix.patch;patch=1 \ + file://${FILESDIR}/install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" prefix = "${STAGING_DIR}" diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe deleted file mode 100644 index d071c9575c..0000000000 --- a/libtool/libtool-cross_1.5.oe +++ /dev/null @@ -1,23 +0,0 @@ -include libtool_${PV}.oe - -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 \ - file://${FILESDIR}/ld.patch;patch=1 \ - file://${FILESDIR}/chmod.patch;patch=1" -S = "${WORKDIR}/libtool-${PV}" - -prefix = "${STAGING_DIR}" -exec_prefix = "${prefix}/${BUILD_SYS}" - -do_compile () { -} - -do_stage () { - install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool -} - -do_install () { -} diff --git a/libtool/libtool-native_1.5.6.oe b/libtool/libtool-native_1.5.6.oe index 1f7421782b..d6f82495be 100644 --- a/libtool/libtool-native_1.5.6.oe +++ b/libtool/libtool-native_1.5.6.oe @@ -1,19 +1,16 @@ -PR = "r1" include libtool_${PV}.oe +PR = "r1" +FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}" +SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \ + file://${FILESDIR}/prefix.patch;patch=1 \ + file://${FILESDIR}/install-path-check.patch;patch=1" +S = "${WORKDIR}/libtool-${PV}" + STAGING_DATADIR_safe := "${STAGING_DATADIR}" inherit native -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}/ld.patch;patch=1 \ -# file://${FILESDIR}/chmod.patch;patch=1 \ -# file://${FILESDIR}/install-path-check.patch;patch=1" -S = "${WORKDIR}/libtool-${PV}" - do_stage () { install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe deleted file mode 100644 index 184543eae9..0000000000 --- a/libtool/libtool-native_1.5.oe +++ /dev/null @@ -1,34 +0,0 @@ -PR = "r1" -include libtool_${PV}.oe - -STAGING_DATADIR_safe := "${STAGING_DATADIR}" - -inherit native - -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}/ld.patch;patch=1 \ - file://${FILESDIR}/chmod.patch;patch=1 \ - file://${FILESDIR}/install-path-check.patch;patch=1" -S = "${WORKDIR}/libtool-${PV}" - -do_stage () { - install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool - 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 - install -d $dir/libtool \ - $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 m4/libtool.m4 $dir/aclocal/ - install -c -m 0644 m4/ltdl.m4 $dir/aclocal/ - done -} - -do_install () { -} diff --git a/libtool/libtool_1.5.6.oe b/libtool/libtool_1.5.6.oe index 9da251f862..58c897fc7d 100644 --- a/libtool/libtool_1.5.6.oe +++ b/libtool/libtool_1.5.6.oe @@ -4,7 +4,6 @@ the complexity of generating special library types (such as shared \ libraries) behind a consistent interface." SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ - file://${FILESDIR}/prefix.patch;patch=1 \ file://${FILESDIR}/autotools.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" diff --git a/libtool/libtool_1.5.oe b/libtool/libtool_1.5.oe index 6d2092eee5..58c897fc7d 100644 --- a/libtool/libtool_1.5.oe +++ b/libtool/libtool_1.5.oe @@ -4,12 +4,16 @@ the complexity of generating special library types (such as shared \ libraries) behind a consistent interface." SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ - file://${FILESDIR}/m4.patch;patch=1 \ - file://${FILESDIR}/autotools.patch;patch=1 \ - file://${FILESDIR}/prefix.patch;patch=1" + file://${FILESDIR}/autotools.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" inherit autotools -acpaths = "-I ${S}/m4" EXTRA_AUTORECONF = "--exclude=libtoolize" + +do_configure () { + find ${S} -name acinclude.m4 | for m4 in `cat`; do + cat ${S}/libtool.m4 ${S}/ltdl.m4 > $m4 + done + autotools_do_configure +} |