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/hardcode: 1.3d 2.1b |
| Date: | Wed, 27 Jan 2010 20:39:35 |
| Message-Id: | E1NaEfk-0000bN-3f@stork.gentoo.org |
| 1 | grobian 10/01/27 20:39:32 |
| 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/hardcode/1.3d |
| 9 | |
| 10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/1.3d?rev=1.1&view=markup |
| 11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/1.3d?rev=1.1&content-type=text/plain |
| 12 | |
| 13 | Index: 1.3d |
| 14 | =================================================================== |
| 15 | http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html |
| 16 | |
| 17 | but this patch disables hardcoding independent of inst_prefix_dir at all, |
| 18 | for both hardcode_direct=yes and hardcode_minus_L=yes. |
| 19 | |
| 20 | If you update this patch, please also update libtool/files/libtool-1.3d-hardcode.patch |
| 21 | |
| 22 | --- ltmain.in.orig 2008-04-16 15:54:04.000000000 +0200 |
| 23 | +++ ltmain.in 2008-04-16 16:21:04.000000000 +0200 |
| 24 | @@ -1900,9 +1900,9 @@ |
| 25 | add_dir= |
| 26 | add= |
| 27 | # Finalize command for both is simple: just hardcode it. |
| 28 | - if test "$hardcode_direct" = yes; then |
| 29 | + if false && test "$hardcode_direct" = yes; then |
| 30 | add="$libdir/$linklib" |
| 31 | - elif test "$hardcode_minus_L" = yes; then |
| 32 | + elif false && test "$hardcode_minus_L" = yes; then |
| 33 | add_dir="-L$libdir" |
| 34 | add="-l$name" |
| 35 | elif test "$hardcode_shlibpath_var" = yes; then |
| 36 | |
| 37 | |
| 38 | |
| 39 | 1.1 eclass/ELT-patches/hardcode/2.1b |
| 40 | |
| 41 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/2.1b?rev=1.1&view=markup |
| 42 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/2.1b?rev=1.1&content-type=text/plain |
| 43 | |
| 44 | Index: 2.1b |
| 45 | =================================================================== |
| 46 | Hardcoding library path does not work with DESTDIR installs. |
| 47 | |
| 48 | Affects any platform with 'hardcode_direct=yes' or 'hardcode_minus_L=yes'. |
| 49 | According to libtool.m4 (as of libtool-1.5.26), these are: |
| 50 | *-aix* |
| 51 | *-hpux9 |
| 52 | hppa-hpux* (not hppa64 or ia64) |
| 53 | *-netbsd |
| 54 | *-openbsd |
| 55 | *-freebsd |
| 56 | *-dragonfly |
| 57 | *-newsos6 |
| 58 | *-os2 |
| 59 | *-amigaos |
| 60 | *-sunos4 |
| 61 | *-sysv4 |
| 62 | It definitely is required for aix (to support DESTDIR), |
| 63 | although it should help for others too... |
| 64 | |
| 65 | --- ../../libtool.orig 2009-07-16 18:06:59 +0200 |
| 66 | +++ ../../libtool 2009-07-16 18:07:45 +0200 |
| 67 | @@ -6298,13 +6298,13 @@ |
| 68 | add_dir= |
| 69 | add= |
| 70 | # Finalize command for both is simple: just hardcode it. |
| 71 | if test "$hardcode_direct" = yes && |
| 72 | test "$hardcode_direct_absolute" = no; then |
| 73 | add="$libdir/$linklib" |
| 74 | - elif test "$hardcode_minus_L" = yes; then |
| 75 | + elif false && test "$hardcode_minus_L" = yes; then |
| 76 | add_dir="-L$libdir" |
| 77 | add="-l$name" |
| 78 | elif test "$hardcode_shlibpath_var" = yes; then |
| 79 | case :$finalize_shlibpath: in |
| 80 | *":$libdir:"*) ;; |
| 81 | *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |