Archives
Archives
| From: | "Fabian Groffen (grobian)" <grobian@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in eclass/ELT-patches/deplibs: 1.5 2.1b |
| Date: | Wed, 27 Jan 2010 20:39:36 |
| Message-Id: | E1NaEfj-0000ax-Ax@stork.gentoo.org |
| 1 | grobian 10/01/27 20:39:31 |
| 2 | |
| 3 | Added: 1.5 2.1b |
| 4 | Log: |
| 5 | add ELT-patches from Prefix, bug #301190 |
| 6 | |
| 7 | Revision Changes Path |
| 8 | 1.1 eclass/ELT-patches/deplibs/1.5 |
| 9 | |
| 10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/deplibs/1.5?rev=1.1&view=markup |
| 11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/deplibs/1.5?rev=1.1&content-type=text/plain |
| 12 | |
| 13 | Index: 1.5 |
| 14 | =================================================================== |
| 15 | --- libtool.orig 2009-07-15 16:25:32 +0200 |
| 16 | +++ libtool 2009-07-15 16:51:56 +0200 |
| 17 | @@ -3319,7 +3319,14 @@ |
| 18 | ;; |
| 19 | esac |
| 20 | if grep "^installed=no" $deplib > /dev/null; then |
| 21 | - path="$absdir/$objdir" |
| 22 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 23 | + eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 24 | + for library_name in ${library_names}; do :; done |
| 25 | + if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then |
| 26 | + path="${inst_prefix_dir}${libdir}" |
| 27 | + else |
| 28 | + path="$absdir/$objdir" |
| 29 | + fi |
| 30 | else |
| 31 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 32 | if test -z "$libdir"; then |
| 33 | |
| 34 | |
| 35 | |
| 36 | 1.1 eclass/ELT-patches/deplibs/2.1b |
| 37 | |
| 38 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/deplibs/2.1b?rev=1.1&view=markup |
| 39 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/deplibs/2.1b?rev=1.1&content-type=text/plain |
| 40 | |
| 41 | Index: 2.1b |
| 42 | =================================================================== |
| 43 | --- ltmain-release-2-1b.in 2009-06-22 15:33:26.000000000 +0200 |
| 44 | +++ ltmain-release-2-1b.in.new 2009-07-15 16:59:45.000000000 +0200 |
| 45 | @@ -4946,7 +4946,14 @@ |
| 46 | fi |
| 47 | ;; |
| 48 | *) |
| 49 | - path="-L$absdir/$objdir" |
| 50 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 51 | + eval library_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 52 | + for library_name in ${library_names}; do :; done |
| 53 | + if test $mode = relink && test -f "${inst_prefix_dir}${libdir}/${library_name}"; then |
| 54 | + path="-L${inst_prefix_dir}${libdir}" |
| 55 | + else |
| 56 | + path="-L$absdir/$objdir" |
| 57 | + fi |
| 58 | ;; |
| 59 | esac |
| 60 | else |