diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/libtool/libtool-1.5.10 | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/libtool/libtool-1.5.10')
-rw-r--r-- | recipes/libtool/libtool-1.5.10/3figures.patch | 29 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/add_sysroot_function.patch | 103 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/autotools.patch | 127 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/install-path-check.patch | 25 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/libdir-la.patch | 52 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/libdir-la2.patch | 64 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/never-ever-do-rpath.patch | 32 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/nmedit_fix.patch | 56 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/nousrlib.patch | 11 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/prefix.patch | 40 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/rpath-control.patch | 21 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/sedvar.patch | 16 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/tag.patch | 19 | ||||
-rw-r--r-- | recipes/libtool/libtool-1.5.10/uclibc.patch | 19 |
14 files changed, 614 insertions, 0 deletions
diff --git a/recipes/libtool/libtool-1.5.10/3figures.patch b/recipes/libtool/libtool-1.5.10/3figures.patch new file mode 100644 index 0000000000..6f632fbe7d --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/3figures.patch @@ -0,0 +1,29 @@ +--- /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/recipes/libtool/libtool-1.5.10/add_sysroot_function.patch b/recipes/libtool/libtool-1.5.10/add_sysroot_function.patch new file mode 100644 index 0000000000..4ce68d92b7 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/add_sysroot_function.patch @@ -0,0 +1,103 @@ +Index: libtool-1.5.10/ltmain.in +=================================================================== +--- libtool-1.5.10.orig/ltmain.in 2008-07-25 16:24:21.000000000 +0800 ++++ libtool-1.5.10/ltmain.in 2008-07-25 18:31:41.000000000 +0800 +@@ -137,6 +137,52 @@ + # Shell function definitions: + # This seems to be the best place for them + ++# func_add_sysroot_path add LIBTOOL_SYSROOT_PATH as prefix in search path ++# -L/usr/lib -> -L/home/foo/usr/lib if sysroot is /home/foo ++func_add_sysroot_path () ++{ ++ _suffix="" ++ _leading="" ++ case "${1}" in ++ -L*) ++ _suffix=`echo ${1} |sed -e s:-L::` ++ _suffix=${LIBTOOL_SYSROOT_PATH}${_suffix} ++ _leading="-L" ++ ;; ++ -I*) ++ _suffix=`echo ${1} |sed -e s:-I::` ++ _suffix=${LIBTOOL_SYSROOT_PATH}${_suffix} ++ _leading="-I" ++ ;; ++ /*) ++ _suffix=${LIBTOOL_SYSROOT_PATH}${1} ++ _leading="" ++ ;; ++ *) ++ _suffix=${1} ++ _leading="" ++ esac ++ eval add_sysroot_path_result=${_leading}${_suffix} ++} ++ ++# func_rm_sysroot_path remove LIBTOOL_SYSROOT_PATH ++# -L/home/foo/usr/lib => if sysroot is /home/foo ++func_rm_sysroot_path () { ++ __rm_sysroot_path=${1} ++ case $__rm_sysroot_path in ++ -L*) ++ __rm_sysroot_path=`echo ${1}|sed -e s:$LIBTOOL_SYSROOT_PATH:/:g` ++ ;; ++ -I*) ++ __rm_sysroot_path=`echo ${1}|sed -e s:$LIBTOOL_SYSROOT_PATH:/:g` ++ ;; ++ /*) ++ __rm_sysroot_path=`echo ${1}|sed -e s:$LIBTOOL_SYSROOT_PATH:/:g` ++ ;; ++ esac ++ rm_sysroot_path_result=`echo ${__rm_sysroot_path}|sed -e s://:/:g` ++} ++ + # func_win32_libid arg + # return the library type of file 'arg' + # +@@ -2196,6 +2242,16 @@ + *) . ./$lib ;; + esac + ++ # Add Sysroot to path # ++ tmp_depen_libs= ++ for depen_lib in $dependency_libs; do ++ func_add_sysroot_path $depen_lib ++ tmp_depen_libs="$tmp_depen_libs $add_sysroot_path_result " ++ done ++ dependency_libs=$tmp_depen_libs ++ func_add_sysroot_path $libdir ++ libdir="$add_sysroot_path_result" ++ + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -2777,6 +2833,10 @@ + # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 + # fi + if ! grep "^installed=no" $deplib > /dev/null; then ++ #Add Sysroot to libdir ++ func_add_sysroot_path $libdir ++ libdir=$add_sysroot_path_result ++ + 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 +@@ -5243,6 +5303,17 @@ + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac ++ ++ # Remove Sysroot from path before write in .la file # ++ tmp_depen_libs= ++ for depen_lib in $dependency_libs; do ++ func_rm_sysroot_path $depen_lib ++ tmp_depen_libs="$tmp_depen_libs $rm_sysroot_path_result " ++ done ++ dependency_libs=$tmp_depen_libs ++ func_rm_sysroot_path $libdir ++ libdir="$rm_sysroot_path_result" ++ + $echo > $output "\ + # $outputname - a libtool library file + # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP diff --git a/recipes/libtool/libtool-1.5.10/autotools.patch b/recipes/libtool/libtool-1.5.10/autotools.patch new file mode 100644 index 0000000000..5df441e945 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/autotools.patch @@ -0,0 +1,127 @@ +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/recipes/libtool/libtool-1.5.10/install-path-check.patch b/recipes/libtool/libtool-1.5.10/install-path-check.patch new file mode 100644 index 0000000000..46cc960986 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/install-path-check.patch @@ -0,0 +1,25 @@ + +# +# 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/recipes/libtool/libtool-1.5.10/libdir-la.patch b/recipes/libtool/libtool-1.5.10/libdir-la.patch new file mode 100644 index 0000000000..47aae4c7af --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/libdir-la.patch @@ -0,0 +1,52 @@ + +# +# 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/recipes/libtool/libtool-1.5.10/libdir-la2.patch b/recipes/libtool/libtool-1.5.10/libdir-la2.patch new file mode 100644 index 0000000000..0d5d261203 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/libdir-la2.patch @@ -0,0 +1,64 @@ +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/recipes/libtool/libtool-1.5.10/never-ever-do-rpath.patch b/recipes/libtool/libtool-1.5.10/never-ever-do-rpath.patch new file mode 100644 index 0000000000..7c92524b3b --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/never-ever-do-rpath.patch @@ -0,0 +1,32 @@ +Well, brute force to disable rpath. + +Only +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) ++#hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + +should be necessary.... + +Index: libtool-1.5.10/libtool.m4 +=================================================================== +--- libtool-1.5.10.orig/libtool.m4 2007-05-27 23:31:51.000000000 +0200 ++++ libtool-1.5.10/libtool.m4 2007-05-27 23:50:26.000000000 +0200 +@@ -4244,16 +4244,16 @@ + hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) + + # Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs ++hardcode_into_libs=no + + # Flag to hardcode \$libdir into a binary during linking. + # This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) ++hardcode_libdir_flag_spec= + + # If ld is used when linking, flag to hardcode \$libdir into + # a binary during linking. This must work even if \$libdir does + # not exist. +-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) ++hardcode_libdir_flag_spec_ld= + + # Whether we need a single -rpath flag with a separated argument. + hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) diff --git a/recipes/libtool/libtool-1.5.10/nmedit_fix.patch b/recipes/libtool/libtool-1.5.10/nmedit_fix.patch new file mode 100644 index 0000000000..673f3a9a28 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/nmedit_fix.patch @@ -0,0 +1,56 @@ +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/recipes/libtool/libtool-1.5.10/nousrlib.patch b/recipes/libtool/libtool-1.5.10/nousrlib.patch new file mode 100644 index 0000000000..e97b45578d --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/nousrlib.patch @@ -0,0 +1,11 @@ +--- 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/recipes/libtool/libtool-1.5.10/prefix.patch b/recipes/libtool/libtool-1.5.10/prefix.patch new file mode 100644 index 0000000000..fa30d02f26 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/prefix.patch @@ -0,0 +1,40 @@ + +# +# 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/recipes/libtool/libtool-1.5.10/rpath-control.patch b/recipes/libtool/libtool-1.5.10/rpath-control.patch new file mode 100644 index 0000000000..310fe3f8ae --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/rpath-control.patch @@ -0,0 +1,21 @@ +diff --git a/ltmain.in b/ltmain.in +--- a/ltmain.in ++++ b/ltmain.in +@@ -3688,6 +3705,7 @@ EOF + rpath="$finalize_rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do ++ if test "$OE_LT_RPATH_ALLOW" = "any" -o "${OE_LT_RPATH_ALLOW/:${libdir}:/}" != "$OE_LT_RPATH_ALLOW" ; then + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then +@@ -3712,6 +3730,9 @@ EOF + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi ++ else ++ echo "OE: Not hardcoding '$libdir' into rpath" ++ fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && diff --git a/recipes/libtool/libtool-1.5.10/sedvar.patch b/recipes/libtool/libtool-1.5.10/sedvar.patch new file mode 100644 index 0000000000..d505edae24 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/sedvar.patch @@ -0,0 +1,16 @@ + +# +# 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/recipes/libtool/libtool-1.5.10/tag.patch b/recipes/libtool/libtool-1.5.10/tag.patch new file mode 100644 index 0000000000..8921a3efb7 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/tag.patch @@ -0,0 +1,19 @@ + +# +# 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/recipes/libtool/libtool-1.5.10/uclibc.patch b/recipes/libtool/libtool-1.5.10/uclibc.patch new file mode 100644 index 0000000000..2c8cbabbb3 --- /dev/null +++ b/recipes/libtool/libtool-1.5.10/uclibc.patch @@ -0,0 +1,19 @@ + +# +# 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)$' |