summaryrefslogtreecommitdiffstats
path: root/meta
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 /meta
parent01793c5bd3b29fca6002e44e2ff59ef16d600c72 (diff)
downloadpoky-01e07585adea462539b95873ac16b27879f13196.tar.gz
libtool: Drop old version 1.5.10
Diffstat (limited to 'meta')
-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 @@
1--- /tmp/ltmain.in 2005-07-24 18:52:11.867735112 +0200
2+++ libtool-1.5.10/ltmain.in 2005-07-24 18:55:49.204694872 +0200
3@@ -3101,7 +3101,7 @@
4
5 # Check that each of the things are valid numbers.
6 case $current in
7- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
8+ 0 | [1-9] | [1-9][0-9]*) ;;
9 *)
10 $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
11 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
12@@ -3110,7 +3110,7 @@
13 esac
14
15 case $revision in
16- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
17+ 0 | [1-9] | [1-9][0-9]*) ;;
18 *)
19 $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
20 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
21@@ -3119,7 +3119,7 @@
22 esac
23
24 case $age in
25- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
26+ 0 | [1-9] | [1-9][0-9]*) ;;
27 *)
28 $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
29 $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 @@
1Index: libtool-1.5.10/libtool.m4
2===================================================================
3--- libtool-1.5.10.orig/libtool.m4 2008-04-10 16:08:19.000000000 +0100
4+++ libtool-1.5.10/libtool.m4 2008-04-10 16:08:44.000000000 +0100
5@@ -67,7 +67,9 @@
6 ifdef([LT_AC_PROG_GCJ],
7 [define([LT_AC_PROG_GCJ],
8 defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
9-])])# AC_PROG_LIBTOOL
10+])
11+DOLT
12+])# AC_PROG_LIBTOOL
13
14
15 # _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 @@
1diff -urNd -urNd libtool-1.5/cdemo/configure.ac libtool-1.5.ac/cdemo/configure.ac
2--- libtool-1.5/cdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
3+++ libtool-1.5.ac/cdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
4@@ -24,6 +24,7 @@
5 ## ------------------------ ##
6 AC_INIT([cdemo], [0.1], [bug-libtool@gnu.org])
7 AC_CONFIG_SRCDIR([main.c])
8+AC_CONFIG_AUX_DIR([..])
9
10
11 ## ------------------------ ##
12diff -urNd -urNd libtool-1.5/demo/configure.ac libtool-1.5.ac/demo/configure.ac
13--- libtool-1.5/demo/configure.ac 2002-03-02 22:19:55.000000000 -0500
14+++ libtool-1.5.ac/demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
15@@ -24,6 +24,7 @@
16 ## ------------------------ ##
17 AC_INIT([demo], [1.0], [bug-libtool@gnu.org])
18 AC_CONFIG_SRCDIR([hello.c])
19+AC_CONFIG_AUX_DIR([..])
20
21
22 ## ------------------------ ##
23diff -urNd -urNd libtool-1.5/demo/Makefile.am libtool-1.5.ac/demo/Makefile.am
24--- libtool-1.5/demo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
25+++ libtool-1.5.ac/demo/Makefile.am 2004-05-05 17:17:34.000000000 -0400
26@@ -121,17 +121,16 @@
27
28 # This is one of the essential tests for deplibs_check_method=pass_all.
29 # If this one passes with pass_all, it is likely that pass_all works
30-EXTRA_LIBRARIES = libhell0.a
31-libhell0_a_SOURCES = hello.c foo.c
32-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
33+EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
34+libhell0_la_SOURCES = hello.c foo.c
35 libhell1_la_SOURCES = hell1.c
36 libhell1_la_LIBADD = -L. -lhell0
37 libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
38-libhell1_la_DEPENDENCIES = libhell0.a
39+libhell1_la_DEPENDENCIES = libhell0.la
40 libhell2_la_SOURCES = hell2.c
41 libhell2_la_LIBADD = -L. -lhell0
42 libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
43-libhell2_la_DEPENDENCIES = libhell0.a
44+libhell2_la_DEPENDENCIES = libhell0.la
45 EXTRA_PROGRAMS = hell0
46 hell0_SOURCES = main.c
47 hell0_LDADD = libhell1.la libhell2.la $(LIBM)
48diff -urNd -urNd libtool-1.5/depdemo/configure.ac libtool-1.5.ac/depdemo/configure.ac
49--- libtool-1.5/depdemo/configure.ac 2002-10-22 15:29:28.000000000 -0400
50+++ libtool-1.5.ac/depdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
51@@ -24,6 +24,7 @@
52 ## ------------------------ ##
53 AC_INIT([depdemo], [0.1], [bug-libtool@gnu.org])
54 AC_CONFIG_SRCDIR([main.c])
55+AC_CONFIG_AUX_DIR([..])
56
57
58 ## ------------------------ ##
59diff -urNd -urNd libtool-1.5/f77demo/configure.ac libtool-1.5.ac/f77demo/configure.ac
60--- libtool-1.5/f77demo/configure.ac 2003-03-22 01:34:27.000000000 -0500
61+++ libtool-1.5.ac/f77demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
62@@ -23,6 +23,7 @@
63 ## ------------------------ ##
64 AC_INIT([f77demo], [0.1], [bug-libtool@gnu.org])
65 AC_CONFIG_SRCDIR([foof.f])dnl
66+AC_CONFIG_AUX_DIR([..])
67
68 ## ------------------------ ##
69 ## Automake Initialisation. ##
70diff -urNd -urNd libtool-1.5/mdemo/configure.ac libtool-1.5.ac/mdemo/configure.ac
71--- libtool-1.5/mdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
72+++ libtool-1.5.ac/mdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
73@@ -24,6 +24,7 @@
74 ## ------------------------ ##
75 AC_INIT([mdemo], [0.1], [bug-libtool@gnu.org])
76 AC_CONFIG_SRCDIR([main.c])
77+AC_CONFIG_AUX_DIR([..])
78
79
80 ## ------------------------ ##
81diff -urNd -urNd libtool-1.5/pdemo/configure.ac libtool-1.5.ac/pdemo/configure.ac
82--- libtool-1.5/pdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
83+++ libtool-1.5.ac/pdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
84@@ -24,6 +24,7 @@
85 ## ------------------------ ##
86 AC_INIT([pdemo], [0.1], [bug-libtool@gnu.org])
87 AC_CONFIG_SRCDIR([longer_file_name_hello.c])
88+AC_CONFIG_AUX_DIR([..])
89
90
91 ## ------------------------ ##
92diff -urNd -urNd libtool-1.5/pdemo/Makefile.am libtool-1.5.ac/pdemo/Makefile.am
93--- libtool-1.5/pdemo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
94+++ libtool-1.5.ac/pdemo/Makefile.am 2004-05-05 17:17:59.000000000 -0400
95@@ -121,17 +121,16 @@
96
97 # This is one of the essential tests for deplibs_check_method=pass_all.
98 # If this one passes with pass_all, it is likely that pass_all works
99-EXTRA_LIBRARIES = libhell0.a
100-libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
101-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
102+libhell0_la_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
103+EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
104 libhell1_la_SOURCES = longer_file_name_hell1.c
105 libhell1_la_LIBADD = -L. -lhell0
106 libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
107-libhell1_la_DEPENDENCIES = libhell0.a
108+libhell1_la_DEPENDENCIES = libhell0.la
109 libhell2_la_SOURCES = longer_file_name_hell2.c
110 libhell2_la_LIBADD = -L. -lhell0
111 libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
112-libhell2_la_DEPENDENCIES = libhell0.a
113+libhell2_la_DEPENDENCIES = libhell0.la
114 EXTRA_PROGRAMS = hell0
115 hell0_SOURCES = longer_file_name_main.c
116 hell0_LDADD = libhell1.la libhell2.la $(LIBM)
117diff -urNd -urNd libtool-1.5/tagdemo/configure.ac libtool-1.5.ac/tagdemo/configure.ac
118--- libtool-1.5/tagdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
119+++ libtool-1.5.ac/tagdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
120@@ -24,6 +24,7 @@
121 ## ------------------------ ##
122 AC_INIT([tagdemo], [0.1], [bug-libtool@gnu.org])
123 AC_CONFIG_SRCDIR([foo.cpp])
124+AC_CONFIG_AUX_DIR([..])
125
126 AC_CANONICAL_TARGET
127
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 @@
1dnl dolt, a replacement for libtool
2dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org>
3dnl Copying and distribution of this file, with or without modification,
4dnl are permitted in any medium without royalty provided the copyright
5dnl notice and this notice are preserved.
6dnl
7dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
8dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
9dnl installed when running autoconf on your project.
10
11AC_DEFUN([DOLT], [
12AC_REQUIRE([AC_CANONICAL_HOST])
13# dolt, a replacement for libtool
14# Josh Triplett <josh@freedesktop.org>
15AC_PATH_PROG(DOLT_BASH, bash)
16AC_MSG_CHECKING([if dolt supports this host])
17dolt_supported=yes
18if test x$DOLT_BASH = x; then
19 AC_MSG_ERROR([dolt: Bash not found, fatal error])
20fi
21if test x$GCC != xyes; then
22 AC_MSG_ERROR([dolt: gcc not found, fatal error])
23fi
24case $host in
25i?86-*-linux*|x86_64-*-linux*|arm-*-linux*) ;;
26*) AC_MSG_ERROR([dolt: incompatible host, fatal error]) ;;
27esac
28AC_MSG_RESULT([yes, replacing libtool])
29
30dnl Start writing out doltcompile.
31 cat <<__DOLTCOMPILE__EOF__ >doltcompile
32#!$DOLT_BASH
33__DOLTCOMPILE__EOF__
34 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
35args=("$[]@")
36for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
37 if test x"${args@<:@$arg@:>@}" = x-o ; then
38 objarg=$((arg+1))
39 break
40 fi
41done
42if test x$objarg = x ; then
43 echo 'Error: no -o on compiler command line' 1>&2
44 exit 1
45fi
46lo="${args@<:@$objarg@:>@}"
47obj="${lo%.lo}"
48if test x"$lo" = x"$obj" ; then
49 echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
50 exit 1
51fi
52objbase="${obj##*/}"
53__DOLTCOMPILE__EOF__
54
55dnl Write out shared compilation code.
56 if test x$enable_shared = xyes; then
57 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
58libobjdir="${obj%$objbase}.libs"
59if test ! -d "$libobjdir" ; then
60 mkdir "$libobjdir"
61 mkdir_ret=$?
62 if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
63 exit $mkdir_ret
64 fi
65fi
66pic_object="$libobjdir/$objbase.o"
67args@<:@$objarg@:>@="$pic_object"
68"${args@<:@@@:>@}" -fPIC -DPIC
69__DOLTCOMPILE__EOF__
70 fi
71
72dnl Write out static compilation code.
73dnl Avoid duplicate compiler output if also building shared objects.
74 if test x$enable_static = xyes; then
75 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
76non_pic_object="$obj.o"
77args@<:@$objarg@:>@="$non_pic_object"
78__DOLTCOMPILE__EOF__
79 if test x$enable_shared = xyes; then
80 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
81"${args@<:@@@:>@}" >/dev/null 2>&1
82__DOLTCOMPILE__EOF__
83 else
84 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
85"${args@<:@@@:>@}"
86__DOLTCOMPILE__EOF__
87 fi
88 fi
89
90dnl Write out the code to write the .lo file.
91dnl The second line of the .lo file must match "^# Generated by .*libtool"
92 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
93{
94echo "# $lo - a libtool object file"
95echo "# Generated by doltcompile, not libtool"
96__DOLTCOMPILE__EOF__
97
98 if test x$enable_shared = xyes; then
99 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
100echo "pic_object='$pic_object'"
101__DOLTCOMPILE__EOF__
102 else
103 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
104echo pic_object=none
105__DOLTCOMPILE__EOF__
106 fi
107
108 if test x$enable_static = xyes; then
109 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
110echo "non_pic_object='$non_pic_object'"
111__DOLTCOMPILE__EOF__
112 else
113 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
114echo non_pic_object=none
115__DOLTCOMPILE__EOF__
116 fi
117
118 cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
119} > "$lo"
120__DOLTCOMPILE__EOF__
121
122dnl Done writing out doltcompile; substitute it for libtool compilation.
123 chmod +x doltcompile
124 LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
125 AC_SUBST(LTCOMPILE)
126 LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
127 AC_SUBST(LTCXXCOMPILE)
128# end dolt
129])
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 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- libtool-1.5.6/ltmain.in~install-path-check 2004-05-14 22:56:19.000000000 -0500
7+++ libtool-1.5.6/ltmain.in 2004-05-14 22:57:48.000000000 -0500
8@@ -5503,10 +5503,13 @@
9 # At present, this check doesn't affect windows .dll's that
10 # are installed into $libdir/../bin (currently, that works fine)
11 # but it's something to keep an eye on.
12- if test "$inst_prefix_dir" = "$destdir"; then
13- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
14- exit $EXIT_FAILURE
15- fi
16+ #
17+ # This breaks install into our staging area. -PB
18+ #
19+ # if test "$inst_prefix_dir" = "$destdir"; then
20+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
21+ # exit $EXIT_FAILURE
22+ # fi
23
24 if test -n "$inst_prefix_dir"; then
25 # 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 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600
7+++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500
8@@ -2147,8 +2147,14 @@
9 absdir="$abs_ladir"
10 libdir="$abs_ladir"
11 else
12- dir="$libdir"
13- absdir="$libdir"
14+ # Adding 'libdir' from the .la file to our library search paths
15+ # breaks crosscompilation horribly. We cheat here and don't add
16+ # it, instead adding the path where we found the .la. -CL
17+ dir="$abs_ladir"
18+ absdir="$abs_ladir"
19+ libdir="$abs_ladir"
20+ #dir="$libdir"
21+ #absdir="$libdir"
22 fi
23 else
24 dir="$ladir/$objdir"
25@@ -2615,6 +2621,16 @@
26 esac
27 if grep "^installed=no" $deplib > /dev/null; then
28 path="$absdir/$objdir"
29+# This interferes with crosscompilation. -CL
30+# else
31+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
32+# if test -z "$libdir"; then
33+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
34+# exit 1
35+# fi
36+# if test "$absdir" != "$libdir"; then
37+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
38+# fi
39 else
40 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
41 if test -z "$libdir"; then
42@@ -5165,6 +5181,10 @@
43 # Replace all uninstalled libtool libraries with the installed ones
44 newdependency_libs=
45 for deplib in $dependency_libs; do
46+ # Replacing uninstalled with installed can easily break crosscompilation,
47+ # since the installed path is generally the wrong architecture. -CL
48+ newdependency_libs="$newdependency_libs $deplib"
49+ continue
50 case $deplib in
51 *.la)
52 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 @@
1OE changes to installed=no which means we can't run the original test
2and just look in $objdir. We therefore look in both, preferring
3$objdir if it exists - RP 29/11/2007
4
5--- libtool-1.5.10/ltmain.in.orig
6+++ libtool-1.5.10/ltmain.in
7@@ -3105,8 +3105,11 @@
8 fi
9 ;;
10 esac
11- if grep "^installed=no" $deplib > /dev/null; then
12- path="$absdir/$objdir"
13+# OE changes to installed=no which means we can't run the original test
14+# and just look in $objdir. We therefore look in both, preferring
15+# $objdir if it exists, see below. - RP 29/11/2007
16+# if grep "^installed=no" $deplib > /dev/null; then
17+# path="$absdir/$objdir"
18 # This interferes with crosscompilation. -CL
19 # else
20 # eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
21@@ -3117,7 +3120,7 @@
22 # if test "$absdir" != "$libdir"; then
23 # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
24 # fi
25- else
26+ if ! grep "^installed=no" $deplib > /dev/null; then
27 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
28 if test -z "$libdir"; then
29 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
30@@ -3138,9 +3141,17 @@
31 for tmp in $deplibrary_names ; do
32 depdepl=$tmp
33 done
34- if test -f "$path/$depdepl" ; then
35- depdepl="$path/$depdepl"
36+
37+ if test -f "$absdir/$objdir/$depdepl" ; then
38+ depdepl="$absdir/$objdir/$depdepl"
39+ path="$absdir/$objdir"
40+ elif test -f "$absdir/$depdepl" ; then
41+ depdepl="$absdir/$depdepl"
42+ path="$absdir"
43+ else
44+ path="$absdir/$objdir"
45 fi
46+
47 # do not add paths which are already there
48 case " $newlib_search_path " in
49 *" $path "*) ;;
50@@ -3150,7 +3161,13 @@
51 path=""
52 ;;
53 *)
54- path="-L$path"
55+ if test -d "$absdir/$objdir" ; then
56+ path="-L$absdir/$objdir"
57+ elif test -d "$absdir" ; then
58+ path="-L$absdir"
59+ else
60+ path="-L$absdir/$objdir"
61+ fi
62 ;;
63 esac
64 ;;
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 @@
1Fix so instead of calling "nmedit" it gets prefixed with the host triplet.
2
3RP - 30/11/2007
4
5Index: libtool-1.5.10/libtool.m4
6===================================================================
7--- libtool-1.5.10.orig/libtool.m4 2007-11-29 19:27:31.000000000 +0000
8+++ libtool-1.5.10/libtool.m4 2007-11-29 19:29:09.000000000 +0000
9@@ -2927,11 +2927,11 @@
10 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
11 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
12 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
13- _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}'
14+ _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}'
15 else
16- _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}'
17+ _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}'
18 fi
19- _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}'
20+ _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}'
21 else
22 case "$cc_basename" in
23 xlc*)
24@@ -2939,8 +2939,8 @@
25 _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'
26 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
27 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
28- _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}'
29- _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}'
30+ _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}'
31+ _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}'
32 ;;
33 *)
34 _LT_AC_TAGVAR(ld_shlibs, $1)=no
35@@ -5474,8 +5474,8 @@
36 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
37 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
38 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
39- _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}'
40- _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}'
41+ _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}'
42+ _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}'
43 else
44 case "$cc_basename" in
45 xlc*)
46@@ -5483,8 +5483,8 @@
47 _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'
48 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
49 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
50- _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}'
51- _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}'
52+ _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}'
53+ _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}'
54 ;;
55 *)
56 _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 @@
1--- libtool-1.5.10.orig/ltmain.in
2+++ libtool-1.5.10/ltmain.in
3@@ -2637,8 +2637,6 @@
4 add="$libdir/$linklib"
5 fi
6 else
7- # We cannot seem to hardcode it, guess we'll fake it.
8- add_dir="-L$libdir"
9 # Try looking first in the location we're being installed to.
10 if test -n "$inst_prefix_dir"; then
11 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 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- libtool-1.5.6/libtool.m4~prefix.patch 2004-05-14 23:02:28.000000000 -0500
7+++ libtool-1.5.6/libtool.m4 2004-05-14 23:02:34.000000000 -0500
8@@ -82,7 +82,8 @@
9 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
10
11 # Always use our own libtool.
12-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
13+LIBTOOL='$(SHELL) $(top_builddir)'
14+LIBTOOL="$LIBTOOL/$host_alias-libtool"
15 AC_SUBST(LIBTOOL)dnl
16
17 # Prevent multiple expansion
18@@ -149,7 +150,7 @@
19 rm="rm -f"
20
21 # Global variables:
22-default_ofile=libtool
23+default_ofile=${host_alias}-libtool
24 can_build_shared=yes
25
26 # All known linkers require a `.a' archive for static linking (except M$VC,
27--- libtool-1.5.6/Makefile.am~prefix.patch 2004-04-11 00:07:06.000000000 -0500
28+++ libtool-1.5.6/Makefile.am 2004-05-14 23:02:46.000000000 -0500
29@@ -30,9 +30,9 @@
30 aclocal_DATA = $(aclocal_macros)
31
32 # The standalone libtool script, and the libtool distributor.
33-bin_SCRIPTS = libtool libtoolize
34+bin_SCRIPTS = $(host_alias)-libtool libtoolize
35
36-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
37+$(host_alias)-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
38 $(SHELL) $(top_builddir)/config.status --recheck
39 chmod +x $@
40
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 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- libtool-1.5.6/ltmain.in~tag 2004-05-15 05:14:32.000000000 -0400
7+++ libtool-1.5.6/ltmain.in 2004-05-15 05:18:01.000000000 -0400
8@@ -226,8 +226,9 @@
9 # line option must be used.
10 if test -z "$tagname"; then
11 $echo "$modename: unable to infer tagged configuration"
12- $echo "$modename: specify a tag with \`--tag'" 1>&2
13- exit $EXIT_FAILURE
14+ $echo "$modename: defaulting to \`CC'"
15+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
16+# exit $EXIT_FAILURE
17 # else
18 # $echo "$modename: using $tagname tagged configuration"
19 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 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- libtool-1.5.8/libtool.m4~uclibc
7+++ libtool-1.5.8/libtool.m4
8@@ -2221,6 +2221,11 @@
9 lt_cv_deplibs_check_method=pass_all
10 ;;
11
12+linux-uclibc*)
13+ lt_cv_deplibs_check_method=pass_all
14+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
15+ ;;
16+
17 netbsd*)
18 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
19 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 @@
1require libtool.inc
2require libtool_${PV}.bb
3
4PR = "r12"
5PACKAGES = ""
6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
7SRC_URI_append = " file://libdir-la.patch;patch=1 \
8 file://libdir-la2.patch;patch=1 \
9 file://prefix.patch;patch=1 \
10 file://tag.patch;patch=1 \
11 file://install-path-check.patch;patch=1 \
12 file://nmedit_fix.patch;patch=1 \
13 file://nousrlib.patch;patch=1"
14
15DOLT_PATCH = ""
16DOLT_PATCH_arm = " file://add_dolt.patch;patch=1"
17DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
18
19SRC_URI_append_linux = "${DOLT_PATCH}"
20SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
21
22S = "${WORKDIR}/libtool-${PV}"
23
24prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
25exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
26bindir = "${STAGING_BINDIR_NATIVE}"
27
28do_configure_prepend () {
29 rm -f ltmain.shT
30 date=`/bin/sh ./mkstamp < ./ChangeLog` && \
31 sed -e 's/@''PACKAGE@/libtool/' -e 's/@''VERSION@/1.5.10/' \
32 -e "s%@""TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT
33 mv -f ltmain.shT ltmain.sh || \
34 (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
35 cp ltmain.sh ./libltdl/
36}
37
38do_compile () {
39 :
40}
41
42do_stage () {
43 install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
44 install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
45 install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
46 install -c config.guess ${STAGING_DATADIR}/libtool/
47 install -c config.sub ${STAGING_DATADIR}/libtool/
48 install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
49 install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
50 install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
51 install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/
52}
53
54do_install () {
55 :
56}
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 @@
1require libtool.inc
2require libtool_${PV}.bb
3
4PR = "r9"
5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
6SRC_URI_append = " file://libdir-la.patch;patch=1 \
7 file://libdir-la2.patch;patch=1 \
8 file://prefix.patch;patch=1 \
9 file://tag.patch;patch=1 \
10 file://install-path-check.patch;patch=1 \
11 file://nousrlib.patch;patch=1"
12
13S = "${WORKDIR}/libtool-${PV}"
14
15inherit native
16
17do_stage () {
18 install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
19 install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
20 oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
21 install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
22 install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
23 install -c config.guess ${STAGING_DATADIR}/libtool/
24 install -c config.sub ${STAGING_DATADIR}/libtool/
25 install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
26 install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
27 install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
28}
29
30do_install () {
31 :
32}
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 @@
1require libtool.inc
2
3PR = "r5"
4
5SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
6 file://autotools.patch;patch=1 \
7 file://uclibc.patch;patch=1 \
8 file://3figures.patch;patch=1 \
9 file://dolt.m4"
10S = "${WORKDIR}/libtool-${PV}"
11
12PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
13FILES_${PN} += "${datadir}/aclocal*"
14FILES_libltdl = "${libdir}/libltdl.so.*"
15FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
16FILES_libltdl-dbg = "${libdir}/.debug/"
17
18inherit autotools
19
20EXTRA_AUTORECONF = "--exclude=libtoolize"
21
22do_configure () {
23 find ${S} -name acinclude.m4 | for m4 in `cat`; do
24 cat ${S}/libtool.m4 ${S}/ltdl.m4 > $m4
25 done
26 autotools_do_configure
27}
28
29do_stage () {
30 oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
31 install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
32}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-25 13:33:22 +0000