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

Contents of /eclass/libtool.eclass

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.4 - (hide annotations) (download)
Mon Jun 10 18:23:49 2002 UTC (12 years, 6 months ago) by azarah
Branch: MAIN
Changes since 1.3: +26 -6 lines
small enhancements

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

  ViewVC Help
Powered by ViewVC 1.1.20