head	1.3;
access;
symbols
	pkgsrc-2016Q4:1.2.0.12
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.10
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.8
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.6
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.4
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.2
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.1.0.6
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.4
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.2
	pkgsrc-2014Q4-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2017.03.06.16.14.07;	author jperkin;	state dead;
branches;
next	1.2;
commitid	o6zvJAUprKsbrvIz;

1.2
date	2015.07.18.16.50.51;	author joerg;	state Exp;
branches;
next	1.1;
commitid	iFFVO5t5dQ1oUMty;

1.1
date	2014.12.02.10.56.24;	author joerg;	state Exp;
branches;
next	;
commitid	CfcjDekMWGCths0y;


desc
@@


1.3
log
@Update libtool packages to 2.4.6.

Changes since 2.4.2 are too numerous to mention, with over 4,700 lines
in the ChangeLog file.  However, this release does at least fix a large
number of build failures on SmartOS, and doesn't appear to cause any
obvious regressions in bulk builds performed by Joerg and myself.

Some pkgsrc cleanups while here, including merging the MirBSD patches
correctly.  It couldn't be made much clearer how to properly integrate
patches here to ensure they are not lost.  Next time you might not be so
fortunate!
@
text
@$NetBSD: manual-ltmain.m4sh,v 1.2 2015/07/18 16:50:51 joerg Exp $

--- libltdl/config/ltmain.m4sh.orig	2014-11-27 21:09:59.000000000 +0000
+++ libltdl/config/ltmain.m4sh
@@@@ -6112,7 +6112,11 @@@@ func_mode_link ()
 	    # Finalize command for both is simple: just hardcode it.
 	    if test "$hardcode_direct" = yes &&
 	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
+	      if test -f "$inst_prefix_dir$libdir/$linklib"; then
+	        add="$inst_prefix_dir$libdir/$linklib"
+	      else
+	        add="$libdir/$linklib"
+	      fi
 	    elif test "$hardcode_minus_L" = yes; then
 	      add_dir="-L$libdir"
 	      add="-l$name"
@@@@ -8632,8 +8636,8 @@@@ dlpreopen='$dlprefiles'
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
+	  if test "$installed" = no && test "$need_relink" = yes && \
+	     test -n "$relink_command"; then
 relink_command=\"$relink_command\""
 	  fi
 	done
@


1.2
log
@Avoid creating empty relink commands. This can happen when libtool
decides in the platform specific logic that relinking is not necessary
after initially setting it, e.g. on OSX. Fixing this and creating more
compact libtool archives is a better approach than working around it in
cwrappers. Bump revision.
@
text
@d1 1
a1 1
$NetBSD: manual-ltmain.m4sh,v 1.1 2014/12/02 10:56:24 joerg Exp $
@


1.1
log
@When relinking with DESTDIR, also look into DESTDIR for the desired
object. Bump revision.
@
text
@d1 1
a1 1
$NetBSD$
d18 11
@