Loading package/Config.in +1 −0 Original line number Diff line number Diff line Loading @@ -264,6 +264,7 @@ source "package/libart/Config.in" source "package/libdrm/Config.in" source "package/libgail/Config.in" source "package/libglade/Config.in" source "package/gdk-pixbuf/Config.in" source "package/libgtk2/Config.in" source "package/libpng/Config.in" source "package/librsvg/Config.in" Loading package/Makefile.autotools.in +17 −6 Original line number Diff line number Diff line Loading @@ -139,10 +139,16 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK # define LIBTOOL_PATCH_HOOK @$(call MESSAGE,"Patching libtool") $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \ "$$($$(PKG)_AUTORECONF)" != "YES"; then \ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \ -a "$$($$(PKG)_AUTORECONF)" != "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool.patch; \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ if test $$$${ltmain_version} = '1.5'; then \ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \ elif test $$$${ltmain_version} = "2.2"; then\ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \ fi \ done \ fi endef Loading @@ -158,9 +164,14 @@ endif define AUTORECONF_HOOK @$(call MESSAGE,"Autoreconfiguring") $(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) $(Q)if test "$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \ if test $$$${ltmain_version} = "1.5"; then \ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \ elif test $$$${ltmain_version} = "2.2"; then\ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \ fi \ done \ fi endef Loading package/buildroot-libtool.patch→package/buildroot-libtool-v1.5.patch +0 −17 Original line number Diff line number Diff line Loading @@ -38,23 +38,6 @@ fi # This is a shared library @@ -2889,6 +2896,16 @@ EOF 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 @@ -5606,6 +5623,10 @@ fi\ # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= Loading package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch→package/buildroot-libtool-v2.2.patch +14 −39 Original line number Diff line number Diff line --- ltmain.sh | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) Index: libmpd-0.17.0/ltmain.sh =================================================================== --- libmpd-0.17.0.orig/ltmain.sh +++ libmpd-0.17.0/ltmain.sh @@ -1056,7 +1056,9 @@ --- a/ltmain.sh 2009-11-16 06:23:18.000000000 -0700 +++ b/ltmain.sh 2010-09-18 20:25:06.000000000 -0700 @@ -1048,8 +1048,8 @@ func_infer_tag () # was found and let the user know that the "--tag" command # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + $echo "$modename: defaulting to \`CC'" + $echo "$modename: if this is not correct, specify a tag with \`--tag'" +# func_fatal_error "specify a tag with \`--tag'" + func_echo "defaulting to \`CC'" + func_echo "if this is not correct, specify a tag with \`--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -2025,8 +2027,13 @@ @@ -2018,8 +2018,11 @@ func_mode_install () # 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. Loading @@ -26,14 +20,12 @@ Index: libmpd-0.17.0/ltmain.sh + # + # 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 + # test "$inst_prefix_dir" = "$destdir" && \ + # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -5419,8 +5426,14 @@ @@ -5412,8 +5415,14 @@ func_mode_link () absdir="$abs_ladir" libdir="$abs_ladir" else Loading @@ -50,7 +42,7 @@ Index: libmpd-0.17.0/ltmain.sh fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -5571,7 +5584,7 @@ @@ -5564,7 +5573,7 @@ func_mode_link () *) if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" Loading @@ -59,24 +51,7 @@ Index: libmpd-0.17.0/ltmain.sh fi ;; esac @@ -5901,6 +5914,16 @@ # Add the search paths of all dependency libraries for deplib in $dependency_libs; do case $deplib in +# 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 -L*) path="$deplib" ;; *.la) func_dirname "$deplib" "" "." @@ -8059,6 +8082,10 @@ @@ -8052,6 +8061,10 @@ EOF # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do Loading package/expat/expat-libdir-la.patchdeleted 100644 → 0 +0 −77 Original line number Diff line number Diff line --- expat-2.0.0/conftools/ltmain.sh.orig 2007-01-13 14:39:51.000000000 -0700 +++ expat-2.0.0/conftools/ltmain.sh 2007-01-13 14:39:56.000000000 -0700 @@ -273,8 +273,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 @@ -2404,8 +2405,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 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -2886,6 +2893,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 @@ -5598,6 +5615,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%^.*/%%'` @@ -5919,10 +5940,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. Loading
package/Config.in +1 −0 Original line number Diff line number Diff line Loading @@ -264,6 +264,7 @@ source "package/libart/Config.in" source "package/libdrm/Config.in" source "package/libgail/Config.in" source "package/libglade/Config.in" source "package/gdk-pixbuf/Config.in" source "package/libgtk2/Config.in" source "package/libpng/Config.in" source "package/librsvg/Config.in" Loading
package/Makefile.autotools.in +17 −6 Original line number Diff line number Diff line Loading @@ -139,10 +139,16 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK # define LIBTOOL_PATCH_HOOK @$(call MESSAGE,"Patching libtool") $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \ "$$($$(PKG)_AUTORECONF)" != "YES"; then \ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \ -a "$$($$(PKG)_AUTORECONF)" != "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool.patch; \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ if test $$$${ltmain_version} = '1.5'; then \ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \ elif test $$$${ltmain_version} = "2.2"; then\ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \ fi \ done \ fi endef Loading @@ -158,9 +164,14 @@ endif define AUTORECONF_HOOK @$(call MESSAGE,"Autoreconfiguring") $(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) $(Q)if test "$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \ if test $$$${ltmain_version} = "1.5"; then \ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \ elif test $$$${ltmain_version} = "2.2"; then\ toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \ fi \ done \ fi endef Loading
package/buildroot-libtool.patch→package/buildroot-libtool-v1.5.patch +0 −17 Original line number Diff line number Diff line Loading @@ -38,23 +38,6 @@ fi # This is a shared library @@ -2889,6 +2896,16 @@ EOF 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 @@ -5606,6 +5623,10 @@ fi\ # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= Loading
package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch→package/buildroot-libtool-v2.2.patch +14 −39 Original line number Diff line number Diff line --- ltmain.sh | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) Index: libmpd-0.17.0/ltmain.sh =================================================================== --- libmpd-0.17.0.orig/ltmain.sh +++ libmpd-0.17.0/ltmain.sh @@ -1056,7 +1056,9 @@ --- a/ltmain.sh 2009-11-16 06:23:18.000000000 -0700 +++ b/ltmain.sh 2010-09-18 20:25:06.000000000 -0700 @@ -1048,8 +1048,8 @@ func_infer_tag () # was found and let the user know that the "--tag" command # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + $echo "$modename: defaulting to \`CC'" + $echo "$modename: if this is not correct, specify a tag with \`--tag'" +# func_fatal_error "specify a tag with \`--tag'" + func_echo "defaulting to \`CC'" + func_echo "if this is not correct, specify a tag with \`--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -2025,8 +2027,13 @@ @@ -2018,8 +2018,11 @@ func_mode_install () # 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. Loading @@ -26,14 +20,12 @@ Index: libmpd-0.17.0/ltmain.sh + # + # 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 + # test "$inst_prefix_dir" = "$destdir" && \ + # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -5419,8 +5426,14 @@ @@ -5412,8 +5415,14 @@ func_mode_link () absdir="$abs_ladir" libdir="$abs_ladir" else Loading @@ -50,7 +42,7 @@ Index: libmpd-0.17.0/ltmain.sh fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -5571,7 +5584,7 @@ @@ -5564,7 +5573,7 @@ func_mode_link () *) if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" Loading @@ -59,24 +51,7 @@ Index: libmpd-0.17.0/ltmain.sh fi ;; esac @@ -5901,6 +5914,16 @@ # Add the search paths of all dependency libraries for deplib in $dependency_libs; do case $deplib in +# 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 -L*) path="$deplib" ;; *.la) func_dirname "$deplib" "" "." @@ -8059,6 +8082,10 @@ @@ -8052,6 +8061,10 @@ EOF # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do Loading
package/expat/expat-libdir-la.patchdeleted 100644 → 0 +0 −77 Original line number Diff line number Diff line --- expat-2.0.0/conftools/ltmain.sh.orig 2007-01-13 14:39:51.000000000 -0700 +++ expat-2.0.0/conftools/ltmain.sh 2007-01-13 14:39:56.000000000 -0700 @@ -273,8 +273,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 @@ -2404,8 +2405,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 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -2886,6 +2893,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 @@ -5598,6 +5615,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%^.*/%%'` @@ -5919,10 +5940,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.
