/[gentoo-x86]/eclass/libtool.eclass
Gentoo

Diff of /eclass/libtool.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.11 Revision 1.25
1#!/bin/bash
2# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Technologies, Inc.
3# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.25 2004/02/11 19:33:14 azarah Exp $
4#
4# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
5# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.11 2002/07/03 19:11:27 azarah Exp $ 6#
6# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
7# relink and portage patch 8# relink and portage patch among others
9
8ECLASS=libtool 10ECLASS="libtool"
11INHERITED="${INHERITED} ${ECLASS}"
12
9newdepend sys-devel/libtool 13newdepend "!bootstrap? ( sys-devel/libtool )"
10 14
11DESCRIPTION="Based on the ${ECLASS} eclass" 15DESCRIPTION="Based on the ${ECLASS} eclass"
12 16
13ELIBTOOL_VERSION=1.8.1 17ELIBTOOL_VERSION="2.0.1"
18
19
20ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches"
21ELT_APPLIED_PATCHES=
22
23#
24# Returns all the directories containing ltmain.sh
25#
26ELT_find_ltmain_sh() {
27 local x=
28 local dirlist=
29
30 for x in $(find "${S}" -name 'ltmain.sh')
31 do
32 dirlist="${dirlist} ${x%/*}"
33 done
34
35 echo "${dirlist}"
36}
37
38#
39# See if we can apply $2 on $1, and if so, do it
40#
41ELT_try_and_apply_patch() {
42 local ret=0
43 local patch="$2"
44
45 # We only support patchlevel of 0 - why worry if its static patches?
46 if patch -p0 --dry-run $1 < ${patch} &>${T}/elibtool.log
47 then
48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch..."
49 patch -p0 $1 < ${patch} &>${T}/elibtool.log
50 ret=$?
51 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
52 else
53 ret=1
54 fi
55
56 return ${ret}
57}
58
59#
60# Run through the patches in $2 and see if any
61# apply to $1 ...
62#
63ELT_walk_patches() {
64 local x=
65 local y=
66 local ret=1
67 local patch_dir=
68
69 if [ -n "$2" ]
70 then
71 if [ -d "${ELT_PATCH_DIR}/$2" ]
72 then
73 patch_dir="${ELT_PATCH_DIR}/$2"
74 else
75 return ${ret}
76 fi
77
78 for x in $(ls -d "${patch_dir}"/* 2>/dev/null)
79 do
80 if [ -n "${x}" -a -f "${x}" ]
81 then
82 # For --remove-internal-dep ...
83 if [ -n "$3" ]
84 then
85 # For replace @REM_INT_DEP@ with what was passed
86 # to --remove-internal-dep
87 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
88 ${T}/$$.rem_int_deps.patch
89
90 x="${T}/$$.rem_int_deps.patch"
91 fi
92
93 if ELT_try_and_apply_patch "$1" "${x}"
94 then
95 ret=0
96 break
97 fi
98 fi
99 done
100 fi
101
102 return ${ret}
103}
14 104
15elibtoolize() { 105elibtoolize() {
16
17 local x="" 106 local x=
18 local y="" 107 local y=
19 local dopatch="no"
20 local dotest="yes"
21 local dorelink="yes"
22 local dotmp="yes"
23 local doportage="yes"
24 local portage="no" 108 local do_portage="no"
25 local reversedeps="no" 109 local do_reversedeps="no"
110 local do_only_patches="no"
111 local deptoremove=
26 local mylist="" 112 local my_dirlist=
113 local elt_patches="portage relink max_cmd_len sed test tmp"
27 114
28 mylist="$(find_ltmain)" 115 my_dirlist="$(ELT_find_ltmain_sh)"
116
29 for x in ${*} 117 for x in $*
30 do 118 do
31 # Only apply portage patch, and dont "libtoolize --copy --force" 119 case "${x}" in
32 # if all patches fail. 120 "--portage")
33 if [ "${x}" = "--portage" ] 121 # Only apply portage patch, and don't
34 then 122 # 'libtoolize --copy --force' if all patches fail.
35 portage="yes" 123 do_portage="yes"
36 fi 124 ;;
125 "--reverse-deps")
37 # Apply the reverse-deps patch 126 # Apply the reverse-deps patch
38 #
39 # http://bugzilla.gnome.org/show_bug.cgi?id=75635 127 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
40 if [ "${x}" = "--reverse-deps" ]
41 then
42 reversedeps="yes" 128 do_reversedeps="yes"
43 fi 129 elt_patches="${elt_patches} fix-relink"
130 ;;
131 "--patch-only")
132 # Do not run libtoolize if none of the patches apply ..
133 do_only_patches="yes"
134 ;;
135 "^--remove-internal-dep="*)
136 # We will replace @REM_INT_DEP@ with what is needed
137 # in ELT_walk_patches() ...
138 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')"
139
140 # Add the patch for this ...
141 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep"
142 ;;
143 "--shallow")
44 # Only patch the ltmain.sh in ${S} 144 # Only patch the ltmain.sh in ${S}
45 if [ "${x}" = "--shallow" ]
46 then
47 if [ -f ${S}/ltmain.sh ] 145 if [ -f "${S}/ltmain.sh" ]
48 then 146 then
49 mylist="${S}" 147 my_dirlist="${S}"
50 else 148 else
51 mylist="" 149 my_dirlist=
52 fi 150 fi
53 else 151 ;;
54 mylist="$(find_ltmain)" 152 esac
55 fi
56 done 153 done
57 154
58 for x in ${mylist} 155 for x in ${my_dirlist}
59 do 156 do
157 local tmp="$(echo "${x}" | sed -e "s|${S}||")"
158 export ELT_APPLIED_PATCHES=
159
60 cd ${x} 160 cd ${x}
61 einfo "Working directory: ${x}..." 161 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g')..."
62 dopatch="yes"
63 dotest="yes"
64 dorelink="yes"
65 dotmp="yes"
66 doportage="yes"
67 162
68 for y in test_patch relink_patch tmp_patch portage_patch 163 for y in ${elt_patches}
69 do 164 do
70 if ! eval ${y} --test $>${T}/libtool.foo 165 local ret=0
166
167 case "${y}" in
168 "rem-int-dep")
169 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
170 ret=$?
171 ;;
172 "fix-relink")
173 # Do not apply if we do not have the relink patch applied ...
174 if [ -n "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ]
175 then
176 ELT_walk_patches "${x}/ltmain.sh" "${y}"
177 ret=$?
178 fi
179 ;;
180 "max_cmd_len")
181 # Do not apply if $max_cmd_len is not used ...
182 if [ -n "$(grep 'max_cmd_len' "${x}/ltmain.sh")" ]
183 then
184 ELT_walk_patches "${x}/ltmain.sh" "${y}"
185 ret=$?
186 fi
187 ;;
188 *)
189 ELT_walk_patches "${x}/ltmain.sh" "${y}"
190 ret=$?
191 ;;
192 esac
193
194 if [ "${ret}" -ne 0 ]
71 then 195 then
72 case ${y} in 196 case ${y} in
73 test_patch) 197 "relink")
74 # non critical patch 198 # Critical patch, but could be applied ...
75 dotest="no" 199 if [ -z "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ]
200 then
201 ewarn " Could not apply relink.patch!"
202 fi
76 ;; 203 ;;
77 relink_patch) 204 "portage")
78 # critical patch, but could be applied 205 # Critical patch - for this one we abort, as it can really
79 if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \ 206 # cause breakage without it applied!
80 [ "${portage}" = "no" ] 207 if [ "${do_portage}" = "yes" ]
81 then 208 then
82 dopatch="no" 209 # Stupid test to see if its already applied ...
210 if [ -z "$(grep 'We do not want portage' "${x}/ltmain.sh")" ]
211 then
212 echo
213 eerror "Portage patch requested, but failed to apply!"
214 die "Portage patch requested, but failed to apply!"
215 fi
216 else
217 ewarn " Could not apply portage.patch!"
218 ewarn " Please verify that it is not needed."
83 fi 219 fi
84 dorelink="no"
85 ;;
86 tmp_patch)
87 # non critical patch
88 dotmp="no"
89 ;;
90 portage_patch)
91 # critical patch
92 if [ "${portage}" = "yes" ]
93 then
94 echo
95 eerror "Portage patch requested, but failed to apply!"
96 die
97 fi
98 dopatch="no"
99 doportage="no"
100 ;; 220 ;;
101 esac 221 esac
102 fi 222 fi
103 done
104 223
105# Only apply portage patch ... I think if other can apply, they should. 224 if [ -z "${ELT_APPLIED_PATCHES}" ]
106# if [ "${portage}" = "yes" ]
107# then
108# dotest="no"
109# dorelink="no"
110# dotmp="no"
111# fi
112
113 for y in test_patch relink_patch tmp_patch portage_patch
114 do
115 if [ "${dopatch}" = "yes" ]
116 then 225 then
117 case ${y} in
118 test_patch)
119 if [ "${dotest}" = "no" ] 226 if [ "${do_portage}" = "no" -a \
227 "${do_reversedeps}" = "no" -a \
228 "${do_only_patches}" = "no" -a \
229 "${deptoremove}" = "" ]
230 then
231 # Sometimes ltmain.sh is in a subdirectory ...
232 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ]
233 then
234 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ]
120 then 235 then
121 continue 236 cd ${x}/../
122 fi 237 fi
123 ;; 238 fi
124 relink_patch) 239
125 if [ "${dorelink}" = "no" ] 240 if which libtoolize &>/dev/null
126 then 241 then
127 continue
128 fi
129 ;;
130 tmp_patch)
131 if [ "${dotmp}" = "no" ]
132 then
133 continue
134 fi
135 ;;
136 portage_patch)
137 if [ "${doportage}" = "no" ]
138 then
139 continue
140 fi
141 ;;
142 esac
143
144 einfo "Applying libtool-${y/_patch/}.patch..."
145 eval ${y} $>${T}/libtool.foo
146 elif [ "${portage}" = "no" ] && [ "${reversedeps}" = "no" ]
147 then
148 ewarn "Cannot apply any patch, running libtoolize..." 242 ewarn "Cannot apply any patch, running libtoolize..."
149 libtoolize --copy --force 243 libtoolize --copy --force
244 fi
245 cd ${x}
150 break 246 break
247 fi
151 fi 248 fi
152 done 249 done
153
154 if [ "${reversedeps}" = "yes" ]
155 then
156 if eval reversedeps_patch --test $>${T}/libtool.foo
157 then
158 einfo "Applying libtool-reverse-deps.patch..."
159 eval reversedeps_patch $>${T}/libtool.foo
160 fi
161 fi
162 done 250 done
163 251
164 if [ -f libtool ] 252 if [ -f libtool ]
165 then 253 then
166 rm -f libtool 254 rm -f libtool
169 # We need to change the pwd back to $S, as we may be called in 257 # We need to change the pwd back to $S, as we may be called in
170 # src_compile() 258 # src_compile()
171 cd ${S} 259 cd ${S}
172} 260}
173 261
174#
175# Returns all the directories containing ltmain.sh
176#
177find_ltmain() {
178
179 local x=""
180 local dirlist=""
181
182 for x in $(find ${S} -name 'ltmain.sh')
183 do
184 dirlist="${dirlist} ${x%/*}"
185 done
186
187 echo "${dirlist}"
188}
189
190#
191# Various patches we want to apply.
192#
193# Contains: portage_patch
194# relink_patch
195# test_patch
196#
197portage_patch() {
198
199 local opts=""
200
201 if [ "${1}" = "--test" ]
202 then
203 opts="--force --dry-run"
204 fi
205
206 patch ${opts} -p0 <<-"ENDPATCH"
207 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002
208 +++ ltmain.sh Sun May 26 19:50:52 2002
209 @@ -3940,9 +3940,46 @@
210 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
211 exit 1
212 fi
213 - newdependency_libs="$newdependency_libs $libdir/$name"
214 + # We do not want portage's install root ($D) present. Check only for
215 + # this if the .la is being installed.
216 + if test "$installed" = yes && test "$D"; then
217 + eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
218 + else
219 + mynewdependency_lib="$libdir/$name"
220 + fi
221 + # Do not add duplicates
222 + if test "$mynewdependency_lib"; then
223 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
224 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
225 + fi
226 + fi
227 + ;;
228 + *)
229 + if test "$installed" = yes; then
230 + # Rather use S=WORKDIR if our version of portage supports it.
231 + # This is because some ebuild (gcc) do not use $S as buildroot.
232 + if test "$PWORKDIR"; then
233 + S="$PWORKDIR"
234 + fi
235 + # We do not want portage's build root ($S) present.
236 + if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
237 + mynewdependency_lib=""
238 + # We do not want portage's install root ($D) present.
239 + elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
240 + eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
241 + else
242 + mynewdependency_lib="$deplib"
243 + fi
244 + else
245 + mynewdependency_lib="$deplib"
246 + fi
247 + # Do not add duplicates
248 + if test "$mynewdependency_lib"; then
249 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
250 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
251 + fi
252 + fi
253 ;;
254 - *) newdependency_libs="$newdependency_libs $deplib" ;;
255 esac
256 done
257 dependency_libs="$newdependency_libs"
258 @@ -3975,6 +4005,10 @@
259 case $host,$output,$installed,$module,$dlname in
260 *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
261 esac
262 + # Do not add duplicates
263 + if test "$installed" = yes && test "$D"; then
264 + install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
265 + fi
266 $echo > $output "\
267 # $outputname - a libtool library file
268 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
269 ENDPATCH
270}
271
272relink_patch() {
273
274 local opts=""
275 local retval=0
276
277 if [ "${1}" = "--test" ]
278 then
279 opts="--force --dry-run"
280 fi
281
282 patch ${opts} -p0 <<-"ENDPATCH"
283 --- ltmain.sh Sun Aug 12 18:08:05 2001
284 +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
285 @@ -827,6 +827,7 @@
286 linker_flags=
287 dllsearchpath=
288 lib_search_path=`pwd`
289 + inst_prefix_dir=
290
291 avoid_version=no
292 dlfiles=
293 @@ -959,6 +960,11 @@
294 prev=
295 continue
296 ;;
297 + inst_prefix)
298 + inst_prefix_dir="$arg"
299 + prev=
300 + continue
301 + ;;
302 release)
303 release="-$arg"
304 prev=
305 @@ -1167,6 +1173,11 @@
306 continue
307 ;;
308
309 + -inst-prefix-dir)
310 + prev=inst_prefix
311 + continue
312 + ;;
313 +
314 # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
315 # so, if we see these flags be careful not to treat them like -L
316 -L[A-Z][A-Z]*:*)
317 @@ -2231,7 +2242,16 @@
318 if test "$hardcode_direct" = yes; then
319 add="$libdir/$linklib"
320 elif test "$hardcode_minus_L" = yes; then
321 - add_dir="-L$libdir"
322 + # Try looking first in the location we're being installed to.
323 + add_dir=
324 + if test -n "$inst_prefix_dir"; then
325 + case "$libdir" in
326 + [\\/]*)
327 + add_dir="-L$inst_prefix_dir$libdir"
328 + ;;
329 + esac
330 + fi
331 + add_dir="$add_dir -L$libdir"
332 add="-l$name"
333 elif test "$hardcode_shlibpath_var" = yes; then
334 case :$finalize_shlibpath: in
335 @@ -2241,7 +2261,16 @@
336 add="-l$name"
337 else
338 # We cannot seem to hardcode it, guess we'll fake it.
339 - add_dir="-L$libdir"
340 + # Try looking first in the location we're being installed to.
341 + add_dir=
342 + if test -n "$inst_prefix_dir"; then
343 + case "$libdir" in
344 + [\\/]*)
345 + add_dir="-L$inst_prefix_dir$libdir"
346 + ;;
347 + esac
348 + fi
349 + add_dir="$add_dir -L$libdir"
350 add="-l$name"
351 fi
352
353 @@ -4622,12 +4651,30 @@
354 dir="$dir$objdir"
355
356 if test -n "$relink_command"; then
357 + # Determine the prefix the user has applied to our future dir.
358 + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
359 +
360 + # Don't allow the user to place us outside of our expected
361 + # location b/c this prevents finding dependent libraries that
362 + # are installed to the same prefix.
363 + if test "$inst_prefix_dir" = "$destdir"; then
364 + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
365 + exit 1
366 + fi
367 +
368 + if test -n "$inst_prefix_dir"; then
369 + # Stick the inst_prefix_dir data into the link command.
370 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
371 + else
372 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
373 + fi
374 +
375 $echo "$modename: warning: relinking \`$file'" 1>&2
376 $show "$relink_command"
377 if $run eval "$relink_command"; then :
378 else
379 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
380 - continue
381 + exit 1
382 fi
383 fi
384
385 ENDPATCH
386
387 retval=$?
388
389 # This one dont apply clean to libtool-1.4.2a, so do it manually.
390 if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ]
391 then
392 cp ltmain.sh ltmain.sh.orig
393 sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \
394 ltmain.sh.orig > ltmain.sh
395 rm -f ltmain.sh.orig
396 fi
397
398 return ${retval}
399}
400
401tmp_patch() {
402
403 local opts=""
404
405 if [ "${1}" = "--test" ]
406 then
407 opts="--force --dry-run"
408 fi
409
410 patch ${opts} -p0 <<-"ENDPATCH"
411 --- ltmain.sh Sun Aug 12 18:08:05 2001
412 +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
413 @@ -4782,7 +4829,11 @@
414 if test "$finalize" = yes && test -z "$run"; then
415 tmpdir="/tmp"
416 test -n "$TMPDIR" && tmpdir="$TMPDIR"
417 - tmpdir="$tmpdir/libtool-$$"
418 + tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
419 + if test $? = 0 ; then :
420 + else
421 + tmpdir="$tmpdir/libtool-$$"
422 + fi
423 if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
424 else
425 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
426 ENDPATCH
427}
428
429test_patch() {
430
431 local opts=""
432
433 if [ "${1}" = "--test" ]
434 then
435 opts="--force --dry-run"
436 fi
437
438 patch ${opts} -p0 <<-"ENDPATCH"
439 --- ./ltmain.sh Tue May 29 19:16:03 2001
440 +++ ./ltmain.sh Tue May 29 21:26:50 2001
441 @@ -459,7 +459,7 @@
442 pic_mode=default
443 ;;
444 esac
445 - if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
446 + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
447 # non-PIC code in shared libraries is not supported
448 pic_mode=default
449 fi
450 @@ -1343,7 +1343,7 @@
451 ;;
452 esac
453 for pass in $passes; do
454 - if test $linkmode = prog; then
455 + if test "$linkmode" = prog; then
456 # Determine which files to process
457 case $pass in
458 dlopen)
459 @@ -1360,11 +1360,11 @@
460 found=no
461 case $deplib in
462 -l*)
463 - if test $linkmode = oldlib && test $linkmode = obj; then
464 + if test "$linkmode" = oldlib && test "$linkmode" = obj; then
465 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
466 continue
467 fi
468 - if test $pass = conv; then
469 + if test "$pass" = conv; then
470 deplibs="$deplib $deplibs"
471 continue
472 fi
473 @@ -1384,7 +1384,7 @@
474 finalize_deplibs="$deplib $finalize_deplibs"
475 else
476 deplibs="$deplib $deplibs"
477 - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
478 + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
479 fi
480 continue
481 fi
482 @@ -1393,16 +1393,16 @@
483 case $linkmode in
484 lib)
485 deplibs="$deplib $deplibs"
486 - test $pass = conv && continue
487 + test "$pass" = conv && continue
488 newdependency_libs="$deplib $newdependency_libs"
489 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
490 ;;
491 prog)
492 - if test $pass = conv; then
493 + if test "$pass" = conv; then
494 deplibs="$deplib $deplibs"
495 continue
496 fi
497 - if test $pass = scan; then
498 + if test "$pass" = scan; then
499 deplibs="$deplib $deplibs"
500 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
501 else
502 @@ -1417,7 +1417,7 @@
503 continue
504 ;; # -L
505 -R*)
506 - if test $pass = link; then
507 + if test "$pass" = link; then
508 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
509 # Make sure the xrpath contains only unique directories.
510 case "$xrpath " in
511 @@ -1430,7 +1430,7 @@
512 ;;
513 *.la) lib="$deplib" ;;
514 *.$libext)
515 - if test $pass = conv; then
516 + if test "$pass" = conv; then
517 deplibs="$deplib $deplibs"
518 continue
519 fi
520 @@ -1451,7 +1451,7 @@
521 continue
522 ;;
523 prog)
524 - if test $pass != link; then
525 + if test "$pass" != link; then
526 deplibs="$deplib $deplibs"
527 else
528 compile_deplibs="$deplib $compile_deplibs"
529 @@ -1462,7 +1462,7 @@
530 esac # linkmode
531 ;; # *.$libext
532 *.lo | *.$objext)
533 - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
534 + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
535 # If there is no dlopen support or we're linking statically,
536 # we need to preload.
537 newdlprefiles="$newdlprefiles $deplib"
538 @@ -1512,13 +1512,13 @@
539
540 if test "$linkmode,$pass" = "lib,link" ||
541 test "$linkmode,$pass" = "prog,scan" ||
542 - { test $linkmode = oldlib && test $linkmode = obj; }; then
543 + { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
544 # Add dl[pre]opened files of deplib
545 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
546 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
547 fi
548
549 - if test $pass = conv; then
550 + if test "$pass" = conv; then
551 # Only check for convenience libraries
552 deplibs="$lib $deplibs"
553 if test -z "$libdir"; then
554 @@ -1537,7 +1537,7 @@
555 esac
556 tmp_libs="$tmp_libs $deplib"
557 done
558 - elif test $linkmode != prog && test $linkmode != lib; then
559 + elif test "$linkmode" != prog && test "$linkmode" != lib; then
560 $echo "$modename: \`$lib' is not a convenience library" 1>&2
561 exit 1
562 fi
563 @@ -1555,7 +1555,7 @@
564 fi
565
566 # This library was specified with -dlopen.
567 - if test $pass = dlopen; then
568 + if test "$pass" = dlopen; then
569 if test -z "$libdir"; then
570 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
571 exit 1
572 @@ -1604,7 +1604,7 @@
573 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
574
575 # This library was specified with -dlpreopen.
576 - if test $pass = dlpreopen; then
577 + if test "$pass" = dlpreopen; then
578 if test -z "$libdir"; then
579 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
580 exit 1
581 @@ -1623,7 +1623,7 @@
582
583 if test -z "$libdir"; then
584 # Link the convenience library
585 - if test $linkmode = lib; then
586 + if test "$linkmode" = lib; then
587 deplibs="$dir/$old_library $deplibs"
588 elif test "$linkmode,$pass" = "prog,link"; then
589 compile_deplibs="$dir/$old_library $compile_deplibs"
590 @@ -1634,7 +1634,7 @@
591 continue
592 fi
593
594 - if test $linkmode = prog && test $pass != link; then
595 + if test "$linkmode" = prog && test "$pass" != link; then
596 newlib_search_path="$newlib_search_path $ladir"
597 deplibs="$lib $deplibs"
598
599 @@ -1671,7 +1671,7 @@
600 # Link against this shared library
601
602 if test "$linkmode,$pass" = "prog,link" ||
603 - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
604 + { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
605 # Hardcode the library path.
606 # Skip directories that are in the system default run-time
607 # search path.
608 @@ -1693,7 +1693,7 @@
609 esac
610 ;;
611 esac
612 - if test $linkmode = prog; then
613 + if test "$linkmode" = prog; then
614 # We need to hardcode the library path
615 if test -n "$shlibpath_var"; then
616 # Make sure the rpath contains only unique directories.
617 @@ -1777,7 +1777,7 @@
618 linklib=$newlib
619 fi # test -n $old_archive_from_expsyms_cmds
620
621 - if test $linkmode = prog || test "$mode" != relink; then
622 + if test "$linkmode" = prog || test "$mode" != relink; then
623 add_shlibpath=
624 add_dir=
625 add=
626 @@ -1826,7 +1826,7 @@
627 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
628 esac
629 fi
630 - if test $linkmode = prog; then
631 + if test "$linkmode" = prog; then
632 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
633 test -n "$add" && compile_deplibs="$add $compile_deplibs"
634 else
635 @@ -1843,7 +1843,7 @@
636 fi
637 fi
638
639 - if test $linkmode = prog || test "$mode" = relink; then
640 + if test "$linkmode" = prog || test "$mode" = relink; then
641 add_shlibpath=
642 add_dir=
643 add=
644 @@ -1865,7 +1865,7 @@
645 add="-l$name"
646 fi
647
648 - if test $linkmode = prog; then
649 + if test "$linkmode" = prog; then
650 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
651 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
652 else
653 @@ -1873,7 +1873,7 @@
654 test -n "$add" && deplibs="$add $deplibs"
655 fi
656 fi
657 - elif test $linkmode = prog; then
658 + elif test "$linkmode" = prog; then
659 if test "$alldeplibs" = yes &&
660 { test "$deplibs_check_method" = pass_all ||
661 { test "$build_libtool_libs" = yes &&
662 @@ -1932,9 +1932,9 @@
663 fi
664 fi # link shared/static library?
665
666 - if test $linkmode = lib; then
667 + if test "$linkmode" = lib; then
668 if test -n "$dependency_libs" &&
669 - { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
670 + { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
671 test $link_static = yes; }; then
672 # Extract -R from dependency_libs
673 temp_deplibs=
674 @@ -1964,7 +1964,7 @@
675 tmp_libs="$tmp_libs $deplib"
676 done
677
678 - if test $link_all_deplibs != no; then
679 + if test "$link_all_deplibs" != no; then
680 # Add the search paths of all dependency libraries
681 for deplib in $dependency_libs; do
682 case $deplib in
683 @@ -2007,15 +2007,15 @@
684 fi # link_all_deplibs != no
685 fi # linkmode = lib
686 done # for deplib in $libs
687 - if test $pass = dlpreopen; then
688 + if test "$pass" = dlpreopen; then
689 # Link the dlpreopened libraries before other libraries
690 for deplib in $save_deplibs; do
691 deplibs="$deplib $deplibs"
692 done
693 fi
694 - if test $pass != dlopen; then
695 - test $pass != scan && dependency_libs="$newdependency_libs"
696 - if test $pass != conv; then
697 + if test "$pass" != dlopen; then
698 + test "$pass" != scan && dependency_libs="$newdependency_libs"
699 + if test "$pass" != conv; then
700 # Make sure lib_search_path contains only unique directories.
701 lib_search_path=
702 for dir in $newlib_search_path; do
703 @@ -2073,7 +2073,7 @@
704 deplibs=
705 fi
706 done # for pass
707 - if test $linkmode = prog; then
708 + if test "$linkmode" = prog; then
709 dlfiles="$newdlfiles"
710 dlprefiles="$newdlprefiles"
711 fi
712 @@ -2410,7 +2410,7 @@
713 ;;
714 *)
715 # Add libc to deplibs on all other systems if necessary.
716 - if test $build_libtool_need_lc = "yes"; then
717 + if test "$build_libtool_need_lc" = "yes"; then
718 deplibs="$deplibs -lc"
719 fi
720 ;;
721 @@ -2683,7 +2683,7 @@
722
723 # Test again, we may have decided not to build it any more
724 if test "$build_libtool_libs" = yes; then
725 - if test $hardcode_into_libs = yes; then
726 + if test "$hardcode_into_libs" = yes; then
727 # Hardcode the library paths
728 hardcode_libdirs=
729 dep_rpath=
730 ENDPATCH
731}
732
733reversedeps_patch() {
734
735 local opts=""
736
737 if [ "${1}" = "--test" ]
738 then
739 opts="--force --dry-run"
740 fi
741
742 patch ${opts} -p0 <<-"ENDPATCH"
743 --- ltmain.sh.orig Sat Mar 23 22:48:45 2002
744 +++ ltmain.sh Sat Mar 23 22:45:38 2002
745 @@ -1553,6 +1553,8 @@
746 convenience="$convenience $ladir/$objdir/$old_library"
747 old_convenience="$old_convenience $ladir/$objdir/$old_library"
748 tmp_libs=
749 + # PKGW
750 + dependency_libs=
751 for deplib in $dependency_libs; do
752 deplibs="$deplib $deplibs"
753 case "$tmp_libs " in
754 @@ -1668,6 +1670,8 @@
755 fi
756
757 tmp_libs=
758 + #PKGW
759 + dependency_libs=
760 for deplib in $dependency_libs; do
761 case $deplib in
762 -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
763 @@ -2081,7 +2085,7 @@
764 -L*)
765 case " $tmp_libs " in
766 *" $deplib "*) ;;
767 - *) tmp_libs="$tmp_libs $deplib" ;;
768 + *) tmp_libs="$deplib $tmp_libs" ;;
769 esac
770 ;;
771 *) tmp_libs="$tmp_libs $deplib" ;;
772 ENDPATCH
773}
774

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.25

  ViewVC Help
Powered by ViewVC 1.1.20