[gentoo-commits] gentoo-x86 commit in eclass/ELT-patches/hardcode: 1.3d 2.1b

[gentoo-commits] gentoo-x86 commit in eclass/ELT-patches/hardcode: 1.3d 2.1b

[Fabian Groffen (grobian)]

grobian     10/01/27 20:39:32

  Added:                1.3d 2.1b
  Log:
  add ELT-patches from Prefix, bug #301190

Revision  Changes    Path
1.1                  eclass/ELT-patches/hardcode/1.3d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/1.3d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/1.3d?rev=1.1&content-type=text/plain

Index: 1.3d
===================================================================
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



1.1                  eclass/ELT-patches/hardcode/2.1b

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/2.1b?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/hardcode/2.1b?rev=1.1&content-type=text/plain

Index: 2.1b
===================================================================
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:" ;;