diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-01-27 20:39:36 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-01-27 20:39:36 +0000 |
| commit | 35b073ccf276d02dc173dfc81d4bdb9a8a9bcf1d (patch) | |
| tree | 04a2bb458dcfd7d3664b7b966e91bc07f9b499c3 /eclass/ELT-patches/hardcode | |
| parent | Package-use-mask flag "mercurial" for app-portage/layman on mips (diff) | |
| download | gentoo-2-35b073ccf276d02dc173dfc81d4bdb9a8a9bcf1d.tar.gz gentoo-2-35b073ccf276d02dc173dfc81d4bdb9a8a9bcf1d.tar.bz2 gentoo-2-35b073ccf276d02dc173dfc81d4bdb9a8a9bcf1d.zip | |
add ELT-patches from Prefix, bug #301190
Diffstat (limited to 'eclass/ELT-patches/hardcode')
| -rw-r--r-- | eclass/ELT-patches/hardcode/1.3d | 21 | ||||
| -rw-r--r-- | eclass/ELT-patches/hardcode/2.1b | 36 |
2 files changed, 57 insertions, 0 deletions
diff --git a/eclass/ELT-patches/hardcode/1.3d b/eclass/ELT-patches/hardcode/1.3d new file mode 100644 index 000000000000..7408b372aec7 --- /dev/null +++ b/eclass/ELT-patches/hardcode/1.3d @@ -0,0 +1,21 @@ +http://lists.gnu.org/archive/html/bug-libtool/2008-03/msg00124.html + +but this patch disables hardcoding independent of inst_prefix_dir at all, +for both hardcode_direct=yes and hardcode_minus_L=yes. + +If you update this patch, please also update libtool/files/libtool-1.3d-hardcode.patch + +--- ltmain.in.orig 2008-04-16 15:54:04.000000000 +0200 ++++ ltmain.in 2008-04-16 16:21:04.000000000 +0200 +@@ -1900,9 +1900,9 @@ + add_dir= + add= + # Finalize command for both is simple: just hardcode it. +- if test "$hardcode_direct" = yes; then ++ if false && test "$hardcode_direct" = yes; then + add="$libdir/$linklib" +- elif test "$hardcode_minus_L" = yes; then ++ elif false && test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then diff --git a/eclass/ELT-patches/hardcode/2.1b b/eclass/ELT-patches/hardcode/2.1b new file mode 100644 index 000000000000..48571f39379f --- /dev/null +++ b/eclass/ELT-patches/hardcode/2.1b @@ -0,0 +1,36 @@ +Hardcoding library path does not work with DESTDIR installs. + +Affects any platform with 'hardcode_direct=yes' or 'hardcode_minus_L=yes'. +According to libtool.m4 (as of libtool-1.5.26), these are: + *-aix* + *-hpux9 + hppa-hpux* (not hppa64 or ia64) + *-netbsd + *-openbsd + *-freebsd + *-dragonfly + *-newsos6 + *-os2 + *-amigaos + *-sunos4 + *-sysv4 +It definitely is required for aix (to support DESTDIR), +although it should help for others too... + +--- ../../libtool.orig 2009-07-16 18:06:59 +0200 ++++ ../../libtool 2009-07-16 18:07:45 +0200 +@@ -6298,13 +6298,13 @@ + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" +- elif test "$hardcode_minus_L" = yes; then ++ elif false && test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |