aboutsummaryrefslogtreecommitdiff
path: root/package/pango
diff options
context:
space:
mode:
authorGravatar John Voltz <john.voltz@gmail.com>2008-05-01 14:07:11 +0000
committerGravatar John Voltz <john.voltz@gmail.com>2008-05-01 14:07:11 +0000
commitf11fa22d0e88c5a3b04429a3110a3cbbf0c30c49 (patch)
treef151f94d270cf31a0b8d4aefd96e124477f63cbe /package/pango
parentac6ab6a2545de81916bb1bd8aeecaf773292de5b (diff)
downloadbuildroot-f11fa22d0e88c5a3b04429a3110a3cbbf0c30c49.tar.gz
buildroot-f11fa22d0e88c5a3b04429a3110a3cbbf0c30c49.tar.bz2
remove unnecessary libdir-la.patch patches and modify Makefile.autotools.in to patch libtool automatically.
Diffstat (limited to 'package/pango')
-rw-r--r--package/pango/pango-1.19.3-libdir-la.patch77
1 files changed, 0 insertions, 77 deletions
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.