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/relink-prog: 1.3d 2.1b |
| Date: | Wed, 27 Jan 2010 20:39:39 |
| Message-Id: | E1NaEfp-0000d4-6P@stork.gentoo.org |
| 1 | grobian 10/01/27 20:39:37 |
| 2 | |
| 3 | Added: 1.3d 2.1b |
| 4 | Log: |
| 5 | add ELT-patches from Prefix, bug #301190 |
| 6 | |
| 7 | Revision Changes Path |
| 8 | 1.1 eclass/ELT-patches/relink-prog/1.3d |
| 9 | |
| 10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/relink-prog/1.3d?rev=1.1&view=markup |
| 11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/relink-prog/1.3d?rev=1.1&content-type=text/plain |
| 12 | |
| 13 | Index: 1.3d |
| 14 | =================================================================== |
| 15 | --- ltmain.sh |
| 16 | +++ ltmain.sh |
| 17 | @@ -3203,6 +3203,12 @@ |
| 18 | add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 19 | ;; |
| 20 | esac |
| 21 | + else |
| 22 | + case $libdir in |
| 23 | + [\\/]*) |
| 24 | + add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir" |
| 25 | + ;; |
| 26 | + esac |
| 27 | fi |
| 28 | add="-l$name" |
| 29 | fi |
| 30 | @@ -6630,7 +6636,7 @@ |
| 31 | esac |
| 32 | fi |
| 33 | libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test |
| 34 | - if test -n "$libdir" && test ! -f "$libfile"; then |
| 35 | + if test -n "$libdir" && test ! -f "${D}$libfile"; then |
| 36 | $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 |
| 37 | finalize=no |
| 38 | fi |
| 39 | |
| 40 | |
| 41 | |
| 42 | 1.1 eclass/ELT-patches/relink-prog/2.1b |
| 43 | |
| 44 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/relink-prog/2.1b?rev=1.1&view=markup |
| 45 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/relink-prog/2.1b?rev=1.1&content-type=text/plain |
| 46 | |
| 47 | Index: 2.1b |
| 48 | =================================================================== |
| 49 | --- ltmain-v2.2.6.in 2009-06-22 15:33:27.000000000 +0200 |
| 50 | +++ ltmain-v2.2.6.in.new 2009-07-16 16:21:04.000000000 +0200 |
| 51 | @@ -1742,7 +1742,7 @@ |
| 52 | func_source "$lib" |
| 53 | fi |
| 54 | libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test |
| 55 | - if test -n "$libdir" && test ! -f "$libfile"; then |
| 56 | + if test -n "$libdir" && test ! -f "${D}$libfile"; then |
| 57 | func_warning "\`$lib' has not been installed in \`$libdir'" |
| 58 | finalize=no |
| 59 | fi |
| 60 | @@ -5351,6 +5351,12 @@ |
| 61 | add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 62 | ;; |
| 63 | esac |
| 64 | + else |
| 65 | + case $libdir in |
| 66 | + [\\/]*) |
| 67 | + add_dir="$add_dir -L\\\"\\\${D}\\\"$libdir" |
| 68 | + ;; |
| 69 | + esac |
| 70 | fi |
| 71 | add="-l$name" |
| 72 | fi |