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

Contents of /eclass/libtool.eclass

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.13 - (hide annotations) (download)
Thu Aug 29 23:56:15 2002 UTC (11 years, 11 months ago) by azarah
Branch: MAIN
Changes since 1.12: +3 -3 lines
small fixor

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

  ViewVC Help
Powered by ViewVC 1.1.20