From f11fa22d0e88c5a3b04429a3110a3cbbf0c30c49 Mon Sep 17 00:00:00 2001 From: John Voltz Date: Thu, 1 May 2008 14:07:11 +0000 Subject: [PATCH] remove unnecessary libdir-la.patch patches and modify Makefile.autotools.in to patch libtool automatically. --- package/Makefile.autotools.in | 10 ++- package/atk/atk-1.9.1-libdir-la.patch | 77 ------------------- ...ibdir-la.patch => buildroot-libtool.patch} | 23 ++++-- package/cairo/cairo-1.4.14-libdir-la.patch | 77 ------------------- .../libgtk2/libgtk2-2.12.6-libdir-la.patch | 77 ------------------- package/pango/pango-1.19.3-libdir-la.patch | 77 ------------------- 6 files changed, 25 insertions(+), 316 deletions(-) delete mode 100644 package/atk/atk-1.9.1-libdir-la.patch rename package/{libglib2/libglib2-2.15.4-libdir-la.patch => buildroot-libtool.patch} (83%) delete mode 100644 package/cairo/cairo-1.4.14-libdir-la.patch delete mode 100644 package/libgtk2/libgtk2-2.12.6-libdir-la.patch delete mode 100644 package/pango/pango-1.19.3-libdir-la.patch diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index 492d4497d1..cf2ac7d239 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -142,7 +142,12 @@ $(BUILD_DIR)/%/.stamp_extracted: $(Q)mkdir -p $(@D) $(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \ $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - - chmod -R ug+rw $(@D) +# some packages have messed up permissions inside + $(Q)chmod -R ug+rw $(@D) +# if the package uses libtool, patch it for cross-compiling in buildroot + for i in `find $(@D) -name ltmain.sh`; do \ + toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \ + done $(Q)touch $@ # Patch @@ -185,6 +190,9 @@ $(BUILD_DIR)/%/.stamp_configured: $(call MESSAGE,"Configuring") $(Q)if test "$($(PKG)_AUTORECONF)" = "YES"; then \ cd $(@D)/$($(PKG)_SUBDIR) && $(AUTORECONF); \ + for i in `find $(@D)/$($(PKG)_SUBDIR) -name ltmain.sh`; do \ + ../../toolchain/patch-kernel.sh $${i%/*} ../../package buildroot-libtool.patch; \ + done \ fi cd $(@D)/$($(PKG)_SUBDIR) && rm -f config.cache && \ $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/atk/atk-1.9.1-libdir-la.patch b/package/atk/atk-1.9.1-libdir-la.patch deleted file mode 100644 index dfaf2e9514..0000000000 --- a/package/atk/atk-1.9.1-libdir-la.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- atk-1.9.1/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700 -+++ atk-1.9.1/ltmain.sh 2007-01-13 14:36:53.000000000 -0700 -@@ -231,8 +231,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 -@@ -2279,8 +2280,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 - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -@@ -2754,6 +2761,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 -@@ -5141,6 +5158,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%^.*/%%'` -@@ -5459,10 +5480,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/package/libglib2/libglib2-2.15.4-libdir-la.patch b/package/buildroot-libtool.patch similarity index 83% rename from package/libglib2/libglib2-2.15.4-libdir-la.patch rename to package/buildroot-libtool.patch index 4bbd670218..277719d938 100644 --- a/package/libglib2/libglib2-2.15.4-libdir-la.patch +++ b/package/buildroot-libtool.patch @@ -1,6 +1,6 @@ ---- glib/ltmain.sh.orig 2006-07-13 01:12:13.000000000 -0600 -+++ glib/ltmain.sh 2007-01-13 13:59:13.000000000 -0700 -@@ -283,8 +283,9 @@ +--- a/ltmain.sh 2006-03-11 13:49:04.000000000 -0500 ++++ b/ltmain.sh 2008-04-30 09:55:28.000000000 -0400 +@@ -273,8 +273,9 @@ func_infer_tag () # line option must be used. if test -z "$tagname"; then $echo "$modename: unable to infer tagged configuration" @@ -12,7 +12,7 @@ # else # $echo "$modename: using $tagname tagged configuration" fi -@@ -2434,8 +2435,14 @@ +@@ -2407,8 +2408,14 @@ EOF absdir="$abs_ladir" libdir="$abs_ladir" else @@ -29,7 +29,16 @@ fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else -@@ -2918,6 +2925,16 @@ +@@ -2545,7 +2552,7 @@ EOF + { test "$use_static_libs" = no || test -z "$old_library"; }; then + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" +- need_relink=yes ++ need_relink=no + fi + # This is a shared library + +@@ -2889,6 +2896,16 @@ EOF esac if grep "^installed=no" $deplib > /dev/null; then path="$absdir/$objdir" @@ -46,7 +55,7 @@ else eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then -@@ -5641,6 +5658,10 @@ +@@ -5606,6 +5623,10 @@ fi\ # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do @@ -57,7 +66,7 @@ case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -@@ -5962,10 +5983,13 @@ +@@ -5927,10 +5948,13 @@ relink_command=\"$relink_command\"" # 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. diff --git a/package/cairo/cairo-1.4.14-libdir-la.patch b/package/cairo/cairo-1.4.14-libdir-la.patch deleted file mode 100644 index c352997d6a..0000000000 --- a/package/cairo/cairo-1.4.14-libdir-la.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- cairo/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700 -+++ cairo/ltmain.sh 2007-01-13 14:36:53.000000000 -0700 -@@ -231,8 +231,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 -@@ -2279,8 +2280,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 - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -@@ -2754,6 +2761,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 -@@ -5141,6 +5158,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%^.*/%%'` -@@ -5459,10 +5480,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/package/libgtk2/libgtk2-2.12.6-libdir-la.patch b/package/libgtk2/libgtk2-2.12.6-libdir-la.patch deleted file mode 100644 index 9df1c88ab3..0000000000 --- a/package/libgtk2/libgtk2-2.12.6-libdir-la.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- gtk/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700 -+++ gtk/ltmain.sh 2007-01-13 14:36:53.000000000 -0700 -@@ -231,8 +231,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 -@@ -2279,8 +2280,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 - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -@@ -2754,6 +2761,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 -@@ -5141,6 +5158,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%^.*/%%'` -@@ -5459,10 +5480,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/package/pango/pango-1.19.3-libdir-la.patch b/package/pango/pango-1.19.3-libdir-la.patch deleted file mode 100644 index 35d977685c..0000000000 --- a/package/pango/pango-1.19.3-libdir-la.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- pango/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700 -+++ pango/ltmain.sh 2007-01-13 14:36:53.000000000 -0700 -@@ -231,8 +231,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 -@@ -2279,8 +2280,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 - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -@@ -2754,6 +2761,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 -@@ -5141,6 +5158,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%^.*/%%'` -@@ -5459,10 +5480,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. -- 2.30.2