1 --- xc/lib/Xft/ltmain.sh.orig 2004-04-23 12:43:42.000000000 -0600
2 +++ xc/lib/Xft/ltmain.sh 2007-01-13 15:04:20.000000000 -0700
4 if test -z "$tagname"; then
5 $echo "$modename: unable to infer tagged configuration"
6 $echo "$modename: specify a tag with \`--tag'" 1>&2
10 # $echo "$modename: using $tagname tagged configuration"
13 if test -z "$tagname"; then
14 $echo "$modename: unable to infer tagged configuration"
15 $echo "$modename: specify a tag with \`--tag'" 1>&2
19 # $echo "$modename: using $tagname tagged configuration"
21 @@ -5362,10 +5362,13 @@
22 # At present, this check doesn't affect windows .dll's that
23 # are installed into $libdir/../bin (currently, that works fine)
24 # but it's something to keep an eye on.
25 - if test "$inst_prefix_dir" = "$destdir"; then
26 - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
30 + # This breaks install into our staging area. -PB
32 + #if test "$inst_prefix_dir" = "$destdir"; then
33 + # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
37 if test -n "$inst_prefix_dir"; then
38 # Stick the inst_prefix_dir data into the link command.
39 --- xc/extras/fontconfig/ltmain.sh.orig 2004-04-23 12:43:42.000000000 -0600
40 +++ xc/extras/fontconfig/ltmain.sh 2007-01-13 15:04:20.000000000 -0700
42 if test -z "$tagname"; then
43 $echo "$modename: unable to infer tagged configuration"
44 $echo "$modename: specify a tag with \`--tag'" 1>&2
48 # $echo "$modename: using $tagname tagged configuration"
51 if test -z "$tagname"; then
52 $echo "$modename: unable to infer tagged configuration"
53 $echo "$modename: specify a tag with \`--tag'" 1>&2
57 # $echo "$modename: using $tagname tagged configuration"
59 @@ -5362,10 +5362,13 @@
60 # At present, this check doesn't affect windows .dll's that
61 # are installed into $libdir/../bin (currently, that works fine)
62 # but it's something to keep an eye on.
63 - if test "$inst_prefix_dir" = "$destdir"; then
64 - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
68 + # This breaks install into our staging area. -PB
70 + #if test "$inst_prefix_dir" = "$destdir"; then
71 + # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
75 if test -n "$inst_prefix_dir"; then
76 # Stick the inst_prefix_dir data into the link command.
77 --- xc/extras/freetype2/builds/unix/ltmain.sh.orig 2007-01-13 15:05:47.000000000 -0700
78 +++ xc/extras/freetype2/builds/unix/ltmain.sh 2007-01-13 15:07:55.000000000 -0700
80 # line option must be used.
81 if test -z "$tagname"; then
82 $echo "$modename: unable to infer tagged configuration"
83 - $echo "$modename: specify a tag with \`--tag'" 1>&2
85 + $echo "$modename: defaulting to \`CC'"
86 + $echo "$modename: if this is not correct, specify a tag with \`--tag'"
89 # $echo "$modename: using $tagname tagged configuration"
91 @@ -2147,8 +2148,14 @@
97 + # Adding 'libdir' from the .la file to our library search paths
98 + # breaks crosscompilation horribly. We cheat here and don't add
99 + # it, instead adding the path where we found the .la. -CL
101 + absdir="$abs_ladir"
102 + libdir="$abs_ladir"
108 @@ -2615,6 +2622,16 @@
110 if grep "^installed=no" $deplib > /dev/null; then
111 path="$absdir/$objdir"
112 +# This interferes with crosscompilation. -CL
114 +# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
115 +# if test -z "$libdir"; then
116 +# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
119 +# if test "$absdir" != "$libdir"; then
120 +# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
123 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
124 if test -z "$libdir"; then
125 @@ -5165,6 +5182,10 @@
126 # Replace all uninstalled libtool libraries with the installed ones
128 for deplib in $dependency_libs; do
129 + # Replacing uninstalled with installed can easily break crosscompilation,
130 + # since the installed path is generally the wrong architecture. -CL
131 + newdependency_libs="$newdependency_libs $deplib"
135 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
136 @@ -5483,10 +5504,13 @@
137 # At present, this check doesn't affect windows .dll's that
138 # are installed into $libdir/../bin (currently, that works fine)
139 # but it's something to keep an eye on.
140 - if test "$inst_prefix_dir" = "$destdir"; then
141 - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
145 + # This breaks install into our staging area. -PB
147 + # if test "$inst_prefix_dir" = "$destdir"; then
148 + # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
149 + # exit $EXIT_FAILURE
152 if test -n "$inst_prefix_dir"; then
153 # Stick the inst_prefix_dir data into the link command.