summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-31 22:14:16 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-02 11:20:12 +0000
commit01e07585adea462539b95873ac16b27879f13196 (patch)
tree546f6005cd75d02b89c88433921282ba7426c416
parent01793c5bd3b29fca6002e44e2ff59ef16d600c72 (diff)
downloadopenembedded-core-01e07585adea462539b95873ac16b27879f13196.tar.gz
openembedded-core-01e07585adea462539b95873ac16b27879f13196.tar.bz2
openembedded-core-01e07585adea462539b95873ac16b27879f13196.zip
libtool: Drop old version 1.5.10
-rw-r--r--meta/packages/libtool/libtool-1.5.10/3figures.patch29
-rw-r--r--meta/packages/libtool/libtool-1.5.10/add_dolt.patch15
-rw-r--r--meta/packages/libtool/libtool-1.5.10/autotools.patch127
-rw-r--r--meta/packages/libtool/libtool-1.5.10/dolt.m4129
-rw-r--r--meta/packages/libtool/libtool-1.5.10/install-path-check.patch25
-rw-r--r--meta/packages/libtool/libtool-1.5.10/libdir-la.patch52
-rw-r--r--meta/packages/libtool/libtool-1.5.10/libdir-la2.patch64
-rw-r--r--meta/packages/libtool/libtool-1.5.10/nmedit_fix.patch56
-rw-r--r--meta/packages/libtool/libtool-1.5.10/nousrlib.patch11
-rw-r--r--meta/packages/libtool/libtool-1.5.10/prefix.patch40
-rw-r--r--meta/packages/libtool/libtool-1.5.10/tag.patch19
-rw-r--r--meta/packages/libtool/libtool-1.5.10/uclibc.patch19
-rw-r--r--meta/packages/libtool/libtool-cross_1.5.10.bb56
-rw-r--r--meta/packages/libtool/libtool-native_1.5.10.bb32
-rw-r--r--meta/packages/libtool/libtool_1.5.10.bb32
15 files changed, 0 insertions, 706 deletions
diff --git a/meta/packages/libtool/libtool-1.5.10/3figures.patch b/meta/packages/libtool/libtool-1.5.10/3figures.patch
deleted file mode 100644
index 6f632fbe7d..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/3figures.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- /tmp/ltmain.in 2005-07-24 18:52:11.867735112 +0200
-+++ libtool-1.5.10/ltmain.in 2005-07-24 18:55:49.204694872 +0200
-@@ -3101,7 +3101,7 @@
-
- # Check that each of the things are valid numbers.
- case $current in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ 0 | [1-9] | [1-9][0-9]*) ;;
- *)
- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -3110,7 +3110,7 @@
- esac
-
- case $revision in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ 0 | [1-9] | [1-9][0-9]*) ;;
- *)
- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -3119,7 +3119,7 @@
- esac
-
- case $age in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ 0 | [1-9] | [1-9][0-9]*) ;;
- *)
- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
diff --git a/meta/packages/libtool/libtool-1.5.10/add_dolt.patch b/meta/packages/libtool/libtool-1.5.10/add_dolt.patch
deleted file mode 100644
index 45dd78a812..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/add_dolt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libtool-1.5.10/libtool.m4
-===================================================================
---- libtool-1.5.10.orig/libtool.m4 2008-04-10 16:08:19.000000000 +0100
-+++ libtool-1.5.10/libtool.m4 2008-04-10 16:08:44.000000000 +0100
-@@ -67,7 +67,9 @@
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
--])])# AC_PROG_LIBTOOL
-+])
-+DOLT
-+])# AC_PROG_LIBTOOL
-
-
- # _AC_PROG_LIBTOOL
diff --git a/meta/packages/libtool/libtool-1.5.10/autotools.patch b/meta/packages/libtool/libtool-1.5.10/autotools.patch
deleted file mode 100644
index 5df441e945..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/autotools.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -urNd -urNd libtool-1.5/cdemo/configure.ac libtool-1.5.ac/cdemo/configure.ac
---- libtool-1.5/cdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
-+++ libtool-1.5.ac/cdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
-@@ -24,6 +24,7 @@
- ## ------------------------ ##
- AC_INIT([cdemo], [0.1], [bug-libtool@gnu.org])
- AC_CONFIG_SRCDIR([main.c])
-+AC_CONFIG_AUX_DIR([..])
-
-
- ## ------------------------ ##
-diff -urNd -urNd libtool-1.5/demo/configure.ac libtool-1.5.ac/demo/configure.ac
---- libtool-1.5/demo/configure.ac 2002-03-02 22:19:55.000000000 -0500
-+++ libtool-1.5.ac/demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
-@@ -24,6 +24,7 @@
- ## ------------------------ ##
- AC_INIT([demo], [1.0], [bug-libtool@gnu.org])
- AC_CONFIG_SRCDIR([hello.c])
-+AC_CONFIG_AUX_DIR([..])
-
-
- ## ------------------------ ##
-diff -urNd -urNd libtool-1.5/demo/Makefile.am libtool-1.5.ac/demo/Makefile.am
---- libtool-1.5/demo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
-+++ libtool-1.5.ac/demo/Makefile.am 2004-05-05 17:17:34.000000000 -0400
-@@ -121,17 +121,16 @@
-
- # This is one of the essential tests for deplibs_check_method=pass_all.
- # If this one passes with pass_all, it is likely that pass_all works
--EXTRA_LIBRARIES = libhell0.a
--libhell0_a_SOURCES = hello.c foo.c
--EXTRA_LTLIBRARIES = libhell1.la libhell2.la
-+EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
-+libhell0_la_SOURCES = hello.c foo.c
- libhell1_la_SOURCES = hell1.c
- libhell1_la_LIBADD = -L. -lhell0
- libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
--libhell1_la_DEPENDENCIES = libhell0.a
-+libhell1_la_DEPENDENCIES = libhell0.la
- libhell2_la_SOURCES = hell2.c
- libhell2_la_LIBADD = -L. -lhell0
- libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
--libhell2_la_DEPENDENCIES = libhell0.a
-+libhell2_la_DEPENDENCIES = libhell0.la
- EXTRA_PROGRAMS = hell0
- hell0_SOURCES = main.c
- hell0_LDADD = libhell1.la libhell2.la $(LIBM)
-diff -urNd -urNd libtool-1.5/depdemo/configure.ac libtool-1.5.ac/depdemo/configure.ac
---- libtool-1.5/depdemo/configure.ac 2002-10-22 15:29:28.000000000 -0400
-+++ libtool-1.5.ac/depdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
-@@ -24,6 +24,7 @@
- ## ------------------------ ##
- AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org])
- AC_CONFIG_SRCDIR([main.c])
-+AC_CONFIG_AUX_DIR([..])
-
-
- ## ------------------------ ##
-diff -urNd -urNd libtool-1.5/f77demo/configure.ac libtool-1.5.ac/f77demo/configure.ac
---- libtool-1.5/f77demo/configure.ac 2003-03-22 01:34:27.000000000 -0500
-+++ libtool-1.5.ac/f77demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
-@@ -23,6 +23,7 @@
- ## ------------------------ ##
- AC_INIT([f77demo], [0.1], [bug-libtool@gnu.org])
- AC_CONFIG_SRCDIR([foof.f])dnl
-+AC_CONFIG_AUX_DIR([..])
-
- ## ------------------------ ##
- ## Automake Initialisation. ##
-diff -urNd -urNd libtool-1.5/mdemo/configure.ac libtool-1.5.ac/mdemo/configure.ac
---- libtool-1.5/mdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
-+++ libtool-1.5.ac/mdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
-@@ -24,6 +24,7 @@
- ## ------------------------ ##
- AC_INIT([mdemo], [0.1], [bug-libtool@gnu.org])
- AC_CONFIG_SRCDIR([main.c])
-+AC_CONFIG_AUX_DIR([..])
-
-
- ## ------------------------ ##
-diff -urNd -urNd libtool-1.5/pdemo/configure.ac libtool-1.5.ac/pdemo/configure.ac
---- libtool-1.5/pdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
-+++ libtool-1.5.ac/pdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
-@@ -24,6 +24,7 @@
- ## ------------------------ ##
- AC_INIT([pdemo], [0.1], [bug-libtool@gnu.org])
- AC_CONFIG_SRCDIR([longer_file_name_hello.c])
-+AC_CONFIG_AUX_DIR([..])
-
-
- ## ------------------------ ##
-diff -urNd -urNd libtool-1.5/pdemo/Makefile.am libtool-1.5.ac/pdemo/Makefile.am
---- libtool-1.5/pdemo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
-+++ libtool-1.5.ac/pdemo/Makefile.am 2004-05-05 17:17:59.000000000 -0400
-@@ -121,17 +121,16 @@
-
- # This is one of the essential tests for deplibs_check_method=pass_all.
- # If this one passes with pass_all, it is likely that pass_all works
--EXTRA_LIBRARIES = libhell0.a
--libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
--EXTRA_LTLIBRARIES = libhell1.la libhell2.la
-+libhell0_la_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
-+EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
- libhell1_la_SOURCES = longer_file_name_hell1.c
- libhell1_la_LIBADD = -L. -lhell0
- libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
--libhell1_la_DEPENDENCIES = libhell0.a
-+libhell1_la_DEPENDENCIES = libhell0.la
- libhell2_la_SOURCES = longer_file_name_hell2.c
- libhell2_la_LIBADD = -L. -lhell0
- libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
--libhell2_la_DEPENDENCIES = libhell0.a
-+libhell2_la_DEPENDENCIES = libhell0.la
- EXTRA_PROGRAMS = hell0
- hell0_SOURCES = longer_file_name_main.c
- hell0_LDADD = libhell1.la libhell2.la $(LIBM)
-diff -urNd -urNd libtool-1.5/tagdemo/configure.ac libtool-1.5.ac/tagdemo/configure.ac
---- libtool-1.5/tagdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
-+++ libtool-1.5.ac/tagdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
-@@ -24,6 +24,7 @@
- ## ------------------------ ##
- AC_INIT([tagdemo], [0.1], [bug-libtool@gnu.org])
- AC_CONFIG_SRCDIR([foo.cpp])
-+AC_CONFIG_AUX_DIR([..])
-
- AC_CANONICAL_TARGET
-
diff --git a/meta/packages/libtool/libtool-1.5.10/dolt.m4 b/meta/packages/libtool/libtool-1.5.10/dolt.m4
deleted file mode 100644
index 9bedecf273..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/dolt.m4
+++ /dev/null
@@ -1,129 +0,0 @@
-dnl dolt, a replacement for libtool
-dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org>
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-dnl
-dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
-dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
-dnl installed when running autoconf on your project.
-
-AC_DEFUN([DOLT], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-# dolt, a replacement for libtool
-# Josh Triplett <josh@freedesktop.org>
-AC_PATH_PROG(DOLT_BASH, bash)
-AC_MSG_CHECKING([if dolt supports this host])
-dolt_supported=yes
-if test x$DOLT_BASH = x; then
- AC_MSG_ERROR([dolt: Bash not found, fatal error])
-fi
-if test x$GCC != xyes; then
- AC_MSG_ERROR([dolt: gcc not found, fatal error])
-fi
-case $host in
-i?86-*-linux*|x86_64-*-linux*|arm-*-linux*) ;;
-*) AC_MSG_ERROR([dolt: incompatible host, fatal error]) ;;
-esac
-AC_MSG_RESULT([yes, replacing libtool])
-
-dnl Start writing out doltcompile.
- cat <<__DOLTCOMPILE__EOF__ >doltcompile
-#!$DOLT_BASH
-__DOLTCOMPILE__EOF__
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-args=("$[]@")
-for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
- if test x"${args@<:@$arg@:>@}" = x-o ; then
- objarg=$((arg+1))
- break
- fi
-done
-if test x$objarg = x ; then
- echo 'Error: no -o on compiler command line' 1>&2
- exit 1
-fi
-lo="${args@<:@$objarg@:>@}"
-obj="${lo%.lo}"
-if test x"$lo" = x"$obj" ; then
- echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
- exit 1
-fi
-objbase="${obj##*/}"
-__DOLTCOMPILE__EOF__
-
-dnl Write out shared compilation code.
- if test x$enable_shared = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-libobjdir="${obj%$objbase}.libs"
-if test ! -d "$libobjdir" ; then
- mkdir "$libobjdir"
- mkdir_ret=$?
- if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
- exit $mkdir_ret
- fi
-fi
-pic_object="$libobjdir/$objbase.o"
-args@<:@$objarg@:>@="$pic_object"
-"${args@<:@@@:>@}" -fPIC -DPIC
-__DOLTCOMPILE__EOF__
- fi
-
-dnl Write out static compilation code.
-dnl Avoid duplicate compiler output if also building shared objects.
- if test x$enable_static = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-non_pic_object="$obj.o"
-args@<:@$objarg@:>@="$non_pic_object"
-__DOLTCOMPILE__EOF__
- if test x$enable_shared = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}" >/dev/null 2>&1
-__DOLTCOMPILE__EOF__
- else
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}"
-__DOLTCOMPILE__EOF__
- fi
- fi
-
-dnl Write out the code to write the .lo file.
-dnl The second line of the .lo file must match "^# Generated by .*libtool"
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-{
-echo "# $lo - a libtool object file"
-echo "# Generated by doltcompile, not libtool"
-__DOLTCOMPILE__EOF__
-
- if test x$enable_shared = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "pic_object='$pic_object'"
-__DOLTCOMPILE__EOF__
- else
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo pic_object=none
-__DOLTCOMPILE__EOF__
- fi
-
- if test x$enable_static = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "non_pic_object='$non_pic_object'"
-__DOLTCOMPILE__EOF__
- else
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo non_pic_object=none
-__DOLTCOMPILE__EOF__
- fi
-
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-} > "$lo"
-__DOLTCOMPILE__EOF__
-
-dnl Done writing out doltcompile; substitute it for libtool compilation.
- chmod +x doltcompile
- LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
- AC_SUBST(LTCOMPILE)
- LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
- AC_SUBST(LTCXXCOMPILE)
-# end dolt
-])
diff --git a/meta/packages/libtool/libtool-1.5.10/install-path-check.patch b/meta/packages/libtool/libtool-1.5.10/install-path-check.patch
deleted file mode 100644
index 46cc960986..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/install-path-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libtool-1.5.6/ltmain.in~install-path-check 2004-05-14 22:56:19.000000000 -0500
-+++ libtool-1.5.6/ltmain.in 2004-05-14 22:57:48.000000000 -0500
-@@ -5503,10 +5503,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
diff --git a/meta/packages/libtool/libtool-1.5.10/libdir-la.patch b/meta/packages/libtool/libtool-1.5.10/libdir-la.patch
deleted file mode 100644
index 47aae4c7af..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/libdir-la.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600
-+++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500
-@@ -2147,8 +2147,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- else
- dir="$ladir/$objdir"
-@@ -2615,6 +2621,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5165,6 +5181,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
diff --git a/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch b/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch
deleted file mode 100644
index 0d5d261203..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-OE changes to installed=no which means we can't run the original test
-and just look in $objdir. We therefore look in both, preferring
-$objdir if it exists - RP 29/11/2007
-
---- libtool-1.5.10/ltmain.in.orig
-+++ libtool-1.5.10/ltmain.in
-@@ -3105,8 +3105,11 @@
- fi
- ;;
- esac
-- if grep "^installed=no" $deplib > /dev/null; then
-- path="$absdir/$objdir"
-+# OE changes to installed=no which means we can't run the original test
-+# and just look in $objdir. We therefore look in both, preferring
-+# $objdir if it exists, see below. - RP 29/11/2007
-+# if grep "^installed=no" $deplib > /dev/null; then
-+# path="$absdir/$objdir"
- # This interferes with crosscompilation. -CL
- # else
- # eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-@@ -3117,7 +3120,7 @@
- # if test "$absdir" != "$libdir"; then
- # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- # fi
-- else
-+ if ! grep "^installed=no" $deplib > /dev/null; then
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-@@ -3138,9 +3141,17 @@
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- done
-- if test -f "$path/$depdepl" ; then
-- depdepl="$path/$depdepl"
-+
-+ if test -f "$absdir/$objdir/$depdepl" ; then
-+ depdepl="$absdir/$objdir/$depdepl"
-+ path="$absdir/$objdir"
-+ elif test -f "$absdir/$depdepl" ; then
-+ depdepl="$absdir/$depdepl"
-+ path="$absdir"
-+ else
-+ path="$absdir/$objdir"
- fi
-+
- # do not add paths which are already there
- case " $newlib_search_path " in
- *" $path "*) ;;
-@@ -3150,7 +3161,13 @@
- path=""
- ;;
- *)
-- path="-L$path"
-+ if test -d "$absdir/$objdir" ; then
-+ path="-L$absdir/$objdir"
-+ elif test -d "$absdir" ; then
-+ path="-L$absdir"
-+ else
-+ path="-L$absdir/$objdir"
-+ fi
- ;;
- esac
- ;;
diff --git a/meta/packages/libtool/libtool-1.5.10/nmedit_fix.patch b/meta/packages/libtool/libtool-1.5.10/nmedit_fix.patch
deleted file mode 100644
index 673f3a9a28..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/nmedit_fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Fix so instead of calling "nmedit" it gets prefixed with the host triplet.
-
-RP - 30/11/2007
-
-Index: libtool-1.5.10/libtool.m4
-===================================================================
---- libtool-1.5.10.orig/libtool.m4 2007-11-29 19:27:31.000000000 +0000
-+++ libtool-1.5.10/libtool.m4 2007-11-29 19:29:09.000000000 +0000
-@@ -2927,11 +2927,11 @@
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case "$cc_basename" in
- xlc*)
-@@ -2939,8 +2939,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5474,8 +5474,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- case "$cc_basename" in
- xlc*)
-@@ -5483,8 +5483,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
diff --git a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch
deleted file mode 100644
index e97b45578d..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool-1.5.10.orig/ltmain.in
-+++ libtool-1.5.10/ltmain.in
-@@ -2637,8 +2637,6 @@
- add="$libdir/$linklib"
- fi
- else
-- # We cannot seem to hardcode it, guess we'll fake it.
-- add_dir="-L$libdir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
- case "$libdir" in
diff --git a/meta/packages/libtool/libtool-1.5.10/prefix.patch b/meta/packages/libtool/libtool-1.5.10/prefix.patch
deleted file mode 100644
index fa30d02f26..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/prefix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libtool-1.5.6/libtool.m4~prefix.patch 2004-05-14 23:02:28.000000000 -0500
-+++ libtool-1.5.6/libtool.m4 2004-05-14 23:02:34.000000000 -0500
-@@ -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,
---- libtool-1.5.6/Makefile.am~prefix.patch 2004-04-11 00:07:06.000000000 -0500
-+++ libtool-1.5.6/Makefile.am 2004-05-14 23:02:46.000000000 -0500
-@@ -30,9 +30,9 @@
- aclocal_DATA = $(aclocal_macros)
-
- # The standalone libtool script, and the libtool distributor.
--bin_SCRIPTS = libtool libtoolize
-+bin_SCRIPTS = $(host_alias)-libtool libtoolize
-
--libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
-+$(host_alias)-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
- $(SHELL) $(top_builddir)/config.status --recheck
- chmod +x $@
-
diff --git a/meta/packages/libtool/libtool-1.5.10/tag.patch b/meta/packages/libtool/libtool-1.5.10/tag.patch
deleted file mode 100644
index 8921a3efb7..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/tag.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libtool-1.5.6/ltmain.in~tag 2004-05-15 05:14:32.000000000 -0400
-+++ libtool-1.5.6/ltmain.in 2004-05-15 05:18:01.000000000 -0400
-@@ -226,8 +226,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
diff --git a/meta/packages/libtool/libtool-1.5.10/uclibc.patch b/meta/packages/libtool/libtool-1.5.10/uclibc.patch
deleted file mode 100644
index 2c8cbabbb3..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/uclibc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libtool-1.5.8/libtool.m4~uclibc
-+++ libtool-1.5.8/libtool.m4
-@@ -2221,6 +2221,11 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-+ ;;
-+
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
diff --git a/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb
deleted file mode 100644
index 207d99a1ed..0000000000
--- a/meta/packages/libtool/libtool-cross_1.5.10.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-require libtool.inc
-require libtool_${PV}.bb
-
-PR = "r12"
-PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
- file://libdir-la2.patch;patch=1 \
- file://prefix.patch;patch=1 \
- file://tag.patch;patch=1 \
- file://install-path-check.patch;patch=1 \
- file://nmedit_fix.patch;patch=1 \
- file://nousrlib.patch;patch=1"
-
-DOLT_PATCH = ""
-DOLT_PATCH_arm = " file://add_dolt.patch;patch=1"
-DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
-
-SRC_URI_append_linux = "${DOLT_PATCH}"
-SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
-
-S = "${WORKDIR}/libtool-${PV}"
-
-prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
-bindir = "${STAGING_BINDIR_NATIVE}"
-
-do_configure_prepend () {
- rm -f ltmain.shT
- date=`/bin/sh ./mkstamp < ./ChangeLog` && \
- sed -e 's/@''PACKAGE@/libtool/' -e 's/@''VERSION@/1.5.10/' \
- -e "s%@""TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT
- mv -f ltmain.shT ltmain.sh || \
- (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
- cp ltmain.sh ./libltdl/
-}
-
-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/
- install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install () {
- :
-}
diff --git a/meta/packages/libtool/libtool-native_1.5.10.bb b/meta/packages/libtool/libtool-native_1.5.10.bb
deleted file mode 100644
index 946b045532..0000000000
--- a/meta/packages/libtool/libtool-native_1.5.10.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require libtool.inc
-require libtool_${PV}.bb
-
-PR = "r9"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://libdir-la.patch;patch=1 \
- file://libdir-la2.patch;patch=1 \
- file://prefix.patch;patch=1 \
- file://tag.patch;patch=1 \
- file://install-path-check.patch;patch=1 \
- file://nousrlib.patch;patch=1"
-
-S = "${WORKDIR}/libtool-${PV}"
-
-inherit native
-
-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}/
- 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/meta/packages/libtool/libtool_1.5.10.bb b/meta/packages/libtool/libtool_1.5.10.bb
deleted file mode 100644
index c78cfefab2..0000000000
--- a/meta/packages/libtool/libtool_1.5.10.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require libtool.inc
-
-PR = "r5"
-
-SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
- file://autotools.patch;patch=1 \
- file://uclibc.patch;patch=1 \
- file://3figures.patch;patch=1 \
- file://dolt.m4"
-S = "${WORKDIR}/libtool-${PV}"
-
-PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
-FILES_${PN} += "${datadir}/aclocal*"
-FILES_libltdl = "${libdir}/libltdl.so.*"
-FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
-FILES_libltdl-dbg = "${libdir}/.debug/"
-
-inherit autotools
-
-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
-}
-
-do_stage () {
- oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
- install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
-}