diff options
| author | joerg <joerg@pkgsrc.org> | 2015-07-18 16:50:51 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-07-18 16:50:51 +0000 |
| commit | 4279d3b96100818f674ecb8e5d1d991305aac4c5 (patch) | |
| tree | 499856311638f7a2fe3e8fc01801472833f3a792 /devel/libtool | |
| parent | d8143fb8ff29abfabd62a390eed198ec23c2ecb5 (diff) | |
| download | pkgsrc-4279d3b96100818f674ecb8e5d1d991305aac4c5.tar.gz | |
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.
Diffstat (limited to 'devel/libtool')
| -rw-r--r-- | devel/libtool/distinfo | 4 | ||||
| -rw-r--r-- | devel/libtool/patches/manual-ltmain.m4sh | 13 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ac | 12 |
3 files changed, 25 insertions, 4 deletions
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 3bcdb1d213d..ec124497945 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.98 2014/12/02 10:56:24 joerg Exp $ +$NetBSD: distinfo,v 1.99 2015/07/18 16:50:51 joerg Exp $ SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88 RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d Size (libtool-2.4.2.tar.gz) = 2632347 bytes SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69 SHA1 (patch-ab) = 3ab767d3c0413bf30b6e9cce62e9686cd3d53fda -SHA1 (patch-ac) = e29517d339483ee39eff7e6bac3013ad32ef2b00 +SHA1 (patch-ac) = fa8b0388f8f0469803c5869a23c3a1247eef70a1 SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4 diff --git a/devel/libtool/patches/manual-ltmain.m4sh b/devel/libtool/patches/manual-ltmain.m4sh index 63881d4308f..82399944468 100644 --- a/devel/libtool/patches/manual-ltmain.m4sh +++ b/devel/libtool/patches/manual-ltmain.m4sh @@ -1,4 +1,4 @@ -$NetBSD: manual-ltmain.m4sh,v 1.1 2014/12/02 10:56:24 joerg Exp $ +$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 @@ -15,3 +15,14 @@ $NetBSD: manual-ltmain.m4sh,v 1.1 2014/12/02 10:56:24 joerg Exp $ 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 diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index 0e6ac81e060..ca042261692 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.34 2014/12/02 10:56:24 joerg Exp $ +$NetBSD: patch-ac,v 1.35 2015/07/18 16:50:51 joerg Exp $ --- libltdl/config/ltmain.sh.orig Mon Oct 17 10:19:11 2011 +++ libltdl/config/ltmain.sh @@ -94,3 +94,13 @@ $NetBSD: patch-ac,v 1.34 2014/12/02 10:56:24 joerg Exp $ major=$major_save release=$release_save libname=$libname_save +@@ -9419,7 +9432,8 @@ dlpreopen='$dlprefiles' + + # Directory that this library needs to be installed in: + libdir='$install_libdir'" +- if test "$installed" = no && test "$need_relink" = yes; then ++ if test "$installed" = no && test "$need_relink" = yes && \ ++ test -n "$relink_command"; then + $ECHO >> $output "\ + relink_command=\"$relink_command\"" + fi |