| blob | 90b0444c600547f460bda20b45670421ab28b1fa |
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
3 @@ -548,7 +548,7 @@
4 if test -z "$tagname"; then
5 $echo "$modename: unable to infer tagged configuration"
6 $echo "$modename: specify a tag with \`--tag'" 1>&2
7 - exit 1
8 + #exit 1
9 # else
10 # $echo "$modename: using $tagname tagged configuration"
11 fi
12 @@ -1652,7 +1652,7 @@
13 if test -z "$tagname"; then
14 $echo "$modename: unable to infer tagged configuration"
15 $echo "$modename: specify a tag with \`--tag'" 1>&2
16 - exit 1
17 + #exit 1
18 # else
19 # $echo "$modename: using $tagname tagged configuration"
20 fi
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
27 - exit 1
28 - fi
29 + #
30 + # This breaks install into our staging area. -PB
31 + #
32 + #if test "$inst_prefix_dir" = "$destdir"; then
33 + # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
34 + # exit 1
35 + #fi
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
41 @@ -548,7 +548,7 @@
42 if test -z "$tagname"; then
43 $echo "$modename: unable to infer tagged configuration"
44 $echo "$modename: specify a tag with \`--tag'" 1>&2
45 - exit 1
46 + #exit 1
47 # else
48 # $echo "$modename: using $tagname tagged configuration"
49 fi
50 @@ -1652,7 +1652,7 @@
51 if test -z "$tagname"; then
52 $echo "$modename: unable to infer tagged configuration"
53 $echo "$modename: specify a tag with \`--tag'" 1>&2
54 - exit 1
55 + #exit 1
56 # else
57 # $echo "$modename: using $tagname tagged configuration"
58 fi
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
65 - exit 1
66 - fi
67 + #
68 + # This breaks install into our staging area. -PB
69 + #
70 + #if test "$inst_prefix_dir" = "$destdir"; then
71 + # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
72 + # exit 1
73 + #fi
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
79 @@ -226,8 +226,9 @@
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
84 - exit $EXIT_FAILURE
85 + $echo "$modename: defaulting to \`CC'"
86 + $echo "$modename: if this is not correct, specify a tag with \`--tag'"
87 +# exit $EXIT_FAILURE
88 # else
89 # $echo "$modename: using $tagname tagged configuration"
90 fi
91 @@ -2147,8 +2148,14 @@
92 absdir="$abs_ladir"
93 libdir="$abs_ladir"
94 else
95 - dir="$libdir"
96 - absdir="$libdir"
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
100 + dir="$abs_ladir"
101 + absdir="$abs_ladir"
102 + libdir="$abs_ladir"
103 + #dir="$libdir"
104 + #absdir="$libdir"
105 fi
106 else
107 dir="$ladir/$objdir"
108 @@ -2615,6 +2622,16 @@
109 esac
110 if grep "^installed=no" $deplib > /dev/null; then
111 path="$absdir/$objdir"
112 +# This interferes with crosscompilation. -CL
113 +# else
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
117 +# exit 1
118 +# fi
119 +# if test "$absdir" != "$libdir"; then
120 +# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
121 +# fi
122 else
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
127 newdependency_libs=
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"
132 + continue
133 case $deplib in
134 *.la)
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
142 - exit $EXIT_FAILURE
143 - fi
144 + #
145 + # This breaks install into our staging area. -PB
146 + #
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
150 + # fi
152 if test -n "$inst_prefix_dir"; then
153 # Stick the inst_prefix_dir data into the link command.