summaryrefslogtreecommitdiff
path: root/libtool/libtool-1.5.10
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /libtool/libtool-1.5.10
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'libtool/libtool-1.5.10')
-rw-r--r--libtool/libtool-1.5.10/autotools.patch127
-rw-r--r--libtool/libtool-1.5.10/install-path-check.patch25
-rw-r--r--libtool/libtool-1.5.10/libdir-la.patch52
-rw-r--r--libtool/libtool-1.5.10/prefix.patch40
-rw-r--r--libtool/libtool-1.5.10/sedvar.patch16
-rw-r--r--libtool/libtool-1.5.10/tag.patch19
-rw-r--r--libtool/libtool-1.5.10/uclibc.patch19
7 files changed, 0 insertions, 298 deletions
diff --git a/libtool/libtool-1.5.10/autotools.patch b/libtool/libtool-1.5.10/autotools.patch
deleted file mode 100644
index 5df441e945..0000000000
--- a/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/libtool/libtool-1.5.10/install-path-check.patch b/libtool/libtool-1.5.10/install-path-check.patch
deleted file mode 100644
index 46cc960986..0000000000
--- a/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/libtool/libtool-1.5.10/libdir-la.patch b/libtool/libtool-1.5.10/libdir-la.patch
deleted file mode 100644
index 47aae4c7af..0000000000
--- a/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/libtool/libtool-1.5.10/prefix.patch b/libtool/libtool-1.5.10/prefix.patch
deleted file mode 100644
index fa30d02f26..0000000000
--- a/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/libtool/libtool-1.5.10/sedvar.patch b/libtool/libtool-1.5.10/sedvar.patch
deleted file mode 100644
index d505edae24..0000000000
--- a/libtool/libtool-1.5.10/sedvar.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libtool-1.5/ltmain.in~sedvar 2003-04-14 16:58:24.000000000 -0500
-+++ libtool-1.5/ltmain.in 2003-09-24 14:18:50.175518400 -0500
-@@ -48,6 +48,8 @@
- exit 0
- fi
-
-+[ -z "${SED}" ] && SED=sed
-+
- # The name of this program.
- progname=`$echo "$0" | ${SED} 's%^.*/%%'`
- modename="$progname"
diff --git a/libtool/libtool-1.5.10/tag.patch b/libtool/libtool-1.5.10/tag.patch
deleted file mode 100644
index 8921a3efb7..0000000000
--- a/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/libtool/libtool-1.5.10/uclibc.patch b/libtool/libtool-1.5.10/uclibc.patch
deleted file mode 100644
index 2c8cbabbb3..0000000000
--- a/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)$'