diff options
Diffstat (limited to 'devel/libtool')
-rw-r--r-- | devel/libtool/distinfo | 6 | ||||
-rw-r--r-- | devel/libtool/patches/manual-libtool.m4 | 68 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 149 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ad | 13 |
4 files changed, 132 insertions, 104 deletions
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index bd681a0acff..9fcd7478137 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.88 2013/07/01 15:59:06 bsiegert Exp $ +$NetBSD: distinfo,v 1.89 2013/08/27 15:50:23 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) = 2ce497fae9415000aa348dd8ea1f1187a50b5db6 +SHA1 (patch-ab) = 621798a0b1ed5b63f90d5cdca9c0287795a3d27c SHA1 (patch-ac) = 108989e3f1ee199fa8e8a9dc7331d360c586a800 -SHA1 (patch-ad) = d52f6494c3c9d6b8ed40171565c7bc99b40badde +SHA1 (patch-ad) = a9471bff3c9f7e87120f78c1461835e6cbc60931 diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4 index 2dea1e7786f..222bbcdc5db 100644 --- a/devel/libtool/patches/manual-libtool.m4 +++ b/devel/libtool/patches/manual-libtool.m4 @@ -1,7 +1,8 @@ -$NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ---- libltdl/m4/libtool.m4.orig 2013-06-27 18:38:56.000000000 +0200 -+++ libltdl/m4/libtool.m4 2013-06-27 18:39:15.000000000 +0200 -@@ -123,7 +123,10 @@ +$NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $ + +--- libltdl/m4/libtool.m4.orig 2011-10-17 10:17:05.000000000 +0000 ++++ libltdl/m4/libtool.m4 +@@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME], *) break;; esac done @@ -13,7 +14,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ]) -@@ -1098,7 +1101,7 @@ +@@ -1098,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in ifort*) _lt_dar_can_shared=yes ;; @@ -22,7 +23,16 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all -@@ -1638,7 +1641,7 @@ +@@ -1482,7 +1485,7 @@ fi + + case $host_os in + darwin*) +- lock_old_archive_extraction=yes ;; ++ lock_old_archive_extraction=no ;; # work around bug #14579 + *) + lock_old_archive_extraction=no ;; + esac +@@ -1638,7 +1641,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d lt_cv_sys_max_cmd_len=8192; ;; @@ -31,7 +41,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -@@ -2468,7 +2471,7 @@ +@@ -2468,7 +2471,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; @@ -40,7 +50,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then -@@ -2482,7 +2485,7 @@ +@@ -2482,7 +2485,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -49,7 +59,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ need_version=no need_lib_prefix=no ;; -@@ -2505,13 +2508,24 @@ +@@ -2505,13 +2508,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -75,7 +85,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no -@@ -2599,12 +2613,7 @@ +@@ -2599,12 +2613,7 @@ interix[[3-9]]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -89,7 +99,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ esac need_lib_prefix=no need_version=no -@@ -2684,19 +2693,36 @@ +@@ -2684,19 +2693,36 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -136,7 +146,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes -@@ -2722,7 +2748,7 @@ +@@ -2722,7 +2748,7 @@ newsos6) ;; openbsd*) @@ -145,7 +155,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -2730,7 +2756,7 @@ +@@ -2730,7 +2756,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -154,7 +164,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -3289,12 +3315,19 @@ +@@ -3289,12 +3315,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -179,7 +189,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ;; newos6*) -@@ -3304,7 +3337,7 @@ +@@ -3304,7 +3337,7 @@ newos6*) ;; *nto* | *qnx*) @@ -188,7 +198,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ;; openbsd*) -@@ -3913,9 +3946,15 @@ +@@ -3913,9 +3946,15 @@ m4_if([$1], [CXX], [ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -205,7 +215,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -3994,6 +4033,9 @@ +@@ -3994,6 +4033,9 @@ m4_if([$1], [CXX], [ ;; esac ;; @@ -215,7 +225,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; -@@ -4232,9 +4274,16 @@ +@@ -4232,9 +4274,16 @@ m4_if([$1], [CXX], [ ;; darwin* | rhapsody*) @@ -233,7 +243,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ;; haiku*) -@@ -4262,6 +4311,13 @@ +@@ -4262,6 +4311,13 @@ m4_if([$1], [CXX], [ # Instead, we relocate shared libraries at runtime. ;; @@ -247,7 +257,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -4415,6 +4471,15 @@ +@@ -4415,6 +4471,15 @@ m4_if([$1], [CXX], [ esac ;; @@ -263,7 +273,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ newsos6) _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4490,6 +4555,9 @@ +@@ -4490,6 +4555,9 @@ m4_if([$1], [CXX], [ ]) case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: @@ -273,7 +283,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; -@@ -4861,16 +4929,28 @@ +@@ -4861,16 +4929,28 @@ _LT_EOF fi ;; @@ -308,7 +318,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ solaris*) if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5342,13 +5422,25 @@ +@@ -5342,13 +5422,25 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -339,7 +349,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; -@@ -5362,6 +5454,11 @@ +@@ -5362,6 +5454,11 @@ _LT_EOF ;; *nto* | *qnx*) @@ -351,7 +361,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ;; openbsd*) -@@ -5819,9 +5916,7 @@ +@@ -5819,9 +5916,7 @@ m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl @@ -362,7 +372,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ AC_PROG_CXXCPP else _lt_caught_CXX_error=yes -@@ -6538,6 +6633,22 @@ +@@ -6538,6 +6633,22 @@ if test "$_lt_caught_CXX_error" != yes; _LT_TAGVAR(ld_shlibs, $1)=no ;; @@ -385,7 +395,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ mvs*) case $cc_basename in cxx*) -@@ -6552,15 +6663,12 @@ +@@ -6552,15 +6663,12 @@ if test "$_lt_caught_CXX_error" != yes; ;; netbsd*) @@ -407,7 +417,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ ;; *nto* | *qnx*) -@@ -6740,9 +6848,9 @@ +@@ -6740,9 +6848,9 @@ if test "$_lt_caught_CXX_error" != yes; if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -419,7 +429,7 @@ $NetBSD: manual-libtool.m4,v 1.36 2013/07/01 15:59:06 bsiegert Exp $ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -6751,9 +6859,9 @@ +@@ -6751,9 +6859,9 @@ if test "$_lt_caught_CXX_error" != yes; else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index f46bc198b9b..23daab02fe0 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ +$NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $ ---- configure.orig 2013-06-27 16:54:36.000000000 +0000 +--- configure.orig 2011-10-17 10:18:58.000000000 +0000 +++ configure @@ -5335,7 +5335,7 @@ else lt_cv_sys_max_cmd_len=8192; @@ -45,6 +45,15 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; openbsd*) +@@ -6473,7 +6480,7 @@ fi + + case $host_os in + darwin*) +- lock_old_archive_extraction=yes ;; ++ lock_old_archive_extraction=no ;; # work around bug #14579 + *) + lock_old_archive_extraction=no ;; + esac @@ -8493,7 +8500,10 @@ for cc_temp in $compiler""; do *) break;; esac @@ -335,7 +344,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ netbsd*) lt_cv_sys_dlopen_deplibs=yes ;; -@@ -13536,9 +13624,7 @@ func_stripname_cnf () +@@ -13536,9 +13627,7 @@ func_stripname_cnf () esac } # func_stripname_cnf @@ -346,7 +355,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -13786,7 +13872,10 @@ $RM -r conftest* +@@ -13786,7 +13875,10 @@ $RM -r conftest* *) break;; esac done @@ -358,7 +367,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ if test -n "$compiler"; then -@@ -14282,7 +14371,7 @@ fi +@@ -14282,7 +14374,7 @@ fi allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in ifort*) _lt_dar_can_shared=yes ;; @@ -367,7 +376,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all -@@ -14651,6 +14740,22 @@ fi +@@ -14651,6 +14743,22 @@ fi ld_shlibs_CXX=no ;; @@ -390,7 +399,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ mvs*) case $cc_basename in cxx*) -@@ -14665,15 +14770,12 @@ fi +@@ -14665,15 +14773,12 @@ fi ;; netbsd*) @@ -412,7 +421,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; *nto* | *qnx*) -@@ -14853,9 +14955,9 @@ fi +@@ -14853,9 +14958,9 @@ fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then @@ -424,7 +433,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -14864,9 +14966,9 @@ fi +@@ -14864,9 +14969,9 @@ fi else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -436,7 +445,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -15236,9 +15338,15 @@ lt_prog_compiler_static_CXX= +@@ -15236,9 +15341,15 @@ lt_prog_compiler_static_CXX= lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -453,7 +462,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -15316,6 +15424,9 @@ lt_prog_compiler_static_CXX= +@@ -15316,6 +15427,9 @@ lt_prog_compiler_static_CXX= ;; esac ;; @@ -463,7 +472,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; -@@ -15513,6 +15624,9 @@ lt_prog_compiler_static_CXX= +@@ -15513,6 +15627,9 @@ lt_prog_compiler_static_CXX= case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: @@ -473,7 +482,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ *djgpp*) lt_prog_compiler_pic_CXX= ;; -@@ -16184,7 +16298,7 @@ dgux*) +@@ -16184,7 +16301,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; @@ -482,7 +491,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then -@@ -16198,7 +16312,7 @@ freebsd* | dragonfly*) +@@ -16198,7 +16315,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -491,7 +500,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ need_version=no need_lib_prefix=no ;; -@@ -16221,13 +16335,24 @@ freebsd* | dragonfly*) +@@ -16221,13 +16338,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -517,7 +526,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no -@@ -16315,12 +16440,7 @@ interix[3-9]*) +@@ -16315,12 +16443,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -531,7 +540,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac need_lib_prefix=no need_version=no -@@ -16419,19 +16539,36 @@ fi +@@ -16419,19 +16542,36 @@ fi dynamic_linker='GNU/Linux ld.so' ;; @@ -578,7 +587,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes -@@ -16457,7 +16594,7 @@ newsos6) +@@ -16457,7 +16597,7 @@ newsos6) ;; openbsd*) @@ -587,7 +596,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -16465,7 +16602,7 @@ openbsd*) +@@ -16465,7 +16605,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -596,7 +605,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -17039,7 +17176,10 @@ $RM -r conftest* +@@ -17039,7 +17179,10 @@ $RM -r conftest* *) break;; esac done @@ -608,7 +617,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ GCC=$G77 if test -n "$compiler"; then -@@ -17131,9 +17271,16 @@ lt_prog_compiler_static_F77= +@@ -17131,9 +17274,16 @@ lt_prog_compiler_static_F77= ;; darwin* | rhapsody*) @@ -626,7 +635,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; haiku*) -@@ -17161,6 +17308,13 @@ lt_prog_compiler_static_F77= +@@ -17161,6 +17311,13 @@ lt_prog_compiler_static_F77= # Instead, we relocate shared libraries at runtime. ;; @@ -640,7 +649,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -17313,6 +17467,15 @@ lt_prog_compiler_static_F77= +@@ -17313,6 +17470,15 @@ lt_prog_compiler_static_F77= esac ;; @@ -656,7 +665,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ newsos6) lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' -@@ -17388,6 +17551,9 @@ lt_prog_compiler_static_F77= +@@ -17388,6 +17554,9 @@ lt_prog_compiler_static_F77= case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: @@ -666,7 +675,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ *djgpp*) lt_prog_compiler_pic_F77= ;; -@@ -17918,16 +18084,28 @@ _LT_EOF +@@ -17918,16 +18087,28 @@ _LT_EOF fi ;; @@ -701,7 +710,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ solaris*) if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ld_shlibs_F77=no -@@ -18324,7 +18502,7 @@ fi +@@ -18324,7 +18505,7 @@ fi allow_undefined_flag_F77="$_lt_dar_allow_undefined" case $cc_basename in ifort*) _lt_dar_can_shared=yes ;; @@ -710,7 +719,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all -@@ -18498,13 +18676,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -18498,13 +18679,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > link_all_deplibs_F77=yes ;; @@ -741,7 +750,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ hardcode_direct_F77=yes hardcode_shlibpath_var_F77=no ;; -@@ -18518,6 +18708,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -18518,6 +18711,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > ;; *nto* | *qnx*) @@ -753,7 +762,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; openbsd*) -@@ -19126,7 +19321,7 @@ dgux*) +@@ -19126,7 +19324,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; @@ -762,7 +771,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then -@@ -19140,7 +19335,7 @@ freebsd* | dragonfly*) +@@ -19140,7 +19338,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -771,7 +780,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ need_version=no need_lib_prefix=no ;; -@@ -19163,13 +19358,24 @@ freebsd* | dragonfly*) +@@ -19163,13 +19361,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -797,7 +806,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no -@@ -19257,12 +19463,7 @@ interix[3-9]*) +@@ -19257,12 +19466,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -811,7 +820,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac need_lib_prefix=no need_version=no -@@ -19355,19 +19556,36 @@ fi +@@ -19355,19 +19559,36 @@ fi dynamic_linker='GNU/Linux ld.so' ;; @@ -858,7 +867,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes -@@ -19393,7 +19611,7 @@ newsos6) +@@ -19393,7 +19614,7 @@ newsos6) ;; openbsd*) @@ -867,7 +876,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -19401,7 +19619,7 @@ openbsd*) +@@ -19401,7 +19622,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -876,7 +885,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -19966,7 +20184,10 @@ $RM -r conftest* +@@ -19966,7 +20187,10 @@ $RM -r conftest* *) break;; esac done @@ -888,7 +897,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ if test -n "$compiler"; then -@@ -20203,9 +20424,16 @@ lt_prog_compiler_static_FC= +@@ -20203,9 +20427,16 @@ lt_prog_compiler_static_FC= ;; darwin* | rhapsody*) @@ -906,7 +915,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; haiku*) -@@ -20233,6 +20461,13 @@ lt_prog_compiler_static_FC= +@@ -20233,6 +20464,13 @@ lt_prog_compiler_static_FC= # Instead, we relocate shared libraries at runtime. ;; @@ -920,7 +929,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -20385,6 +20620,15 @@ lt_prog_compiler_static_FC= +@@ -20385,6 +20623,15 @@ lt_prog_compiler_static_FC= esac ;; @@ -936,7 +945,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ newsos6) lt_prog_compiler_pic_FC='-KPIC' lt_prog_compiler_static_FC='-Bstatic' -@@ -20460,6 +20704,9 @@ lt_prog_compiler_static_FC= +@@ -20460,6 +20707,9 @@ lt_prog_compiler_static_FC= case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: @@ -946,7 +955,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ *djgpp*) lt_prog_compiler_pic_FC= ;; -@@ -20990,16 +21237,28 @@ _LT_EOF +@@ -20990,16 +21240,28 @@ _LT_EOF fi ;; @@ -981,7 +990,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ solaris*) if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ld_shlibs_FC=no -@@ -21396,7 +21655,7 @@ fi +@@ -21396,7 +21658,7 @@ fi allow_undefined_flag_FC="$_lt_dar_allow_undefined" case $cc_basename in ifort*) _lt_dar_can_shared=yes ;; @@ -990,7 +999,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all -@@ -21570,13 +21829,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -21570,13 +21832,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > link_all_deplibs_FC=yes ;; @@ -1021,7 +1030,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ hardcode_direct_FC=yes hardcode_shlibpath_var_FC=no ;; -@@ -21590,6 +21861,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -21590,6 +21864,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > ;; *nto* | *qnx*) @@ -1033,7 +1042,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; openbsd*) -@@ -22198,7 +22474,7 @@ dgux*) +@@ -22198,7 +22477,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; @@ -1042,7 +1051,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then -@@ -22212,7 +22488,7 @@ freebsd* | dragonfly*) +@@ -22212,7 +22491,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -1051,7 +1060,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ need_version=no need_lib_prefix=no ;; -@@ -22235,13 +22511,24 @@ freebsd* | dragonfly*) +@@ -22235,13 +22514,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -1077,7 +1086,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no -@@ -22329,12 +22616,7 @@ interix[3-9]*) +@@ -22329,12 +22619,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1091,7 +1100,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac need_lib_prefix=no need_version=no -@@ -22427,19 +22709,36 @@ fi +@@ -22427,19 +22712,36 @@ fi dynamic_linker='GNU/Linux ld.so' ;; @@ -1138,7 +1147,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes -@@ -22465,7 +22764,7 @@ newsos6) +@@ -22465,7 +22767,7 @@ newsos6) ;; openbsd*) @@ -1147,7 +1156,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -22473,7 +22772,7 @@ openbsd*) +@@ -22473,7 +22775,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -1156,7 +1165,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -22883,7 +23182,10 @@ for cc_temp in $compiler""; do +@@ -22883,7 +23185,10 @@ for cc_temp in $compiler""; do *) break;; esac done @@ -1168,7 +1177,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ # Go did not exist at the time GCC didn't implicitly link libc in. -@@ -23003,9 +23305,16 @@ lt_prog_compiler_static_GO= +@@ -23003,9 +23308,16 @@ lt_prog_compiler_static_GO= ;; darwin* | rhapsody*) @@ -1186,7 +1195,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; haiku*) -@@ -23033,6 +23342,13 @@ lt_prog_compiler_static_GO= +@@ -23033,6 +23345,13 @@ lt_prog_compiler_static_GO= # Instead, we relocate shared libraries at runtime. ;; @@ -1200,7 +1209,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -23185,6 +23501,15 @@ lt_prog_compiler_static_GO= +@@ -23185,6 +23504,15 @@ lt_prog_compiler_static_GO= esac ;; @@ -1216,7 +1225,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ newsos6) lt_prog_compiler_pic_GO='-KPIC' lt_prog_compiler_static_GO='-Bstatic' -@@ -23260,6 +23585,9 @@ lt_prog_compiler_static_GO= +@@ -23260,6 +23588,9 @@ lt_prog_compiler_static_GO= case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: @@ -1226,7 +1235,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ *djgpp*) lt_prog_compiler_pic_GO= ;; -@@ -23790,16 +24118,28 @@ _LT_EOF +@@ -23790,16 +24121,28 @@ _LT_EOF fi ;; @@ -1261,7 +1270,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ solaris*) if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ld_shlibs_GO=no -@@ -24208,7 +24548,7 @@ fi +@@ -24208,7 +24551,7 @@ fi allow_undefined_flag_GO="$_lt_dar_allow_undefined" case $cc_basename in ifort*) _lt_dar_can_shared=yes ;; @@ -1270,7 +1279,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all -@@ -24381,13 +24721,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -24381,13 +24724,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > link_all_deplibs_GO=yes ;; @@ -1301,7 +1310,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ hardcode_direct_GO=yes hardcode_shlibpath_var_GO=no ;; -@@ -24401,6 +24753,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -24401,6 +24756,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > ;; *nto* | *qnx*) @@ -1313,7 +1322,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; openbsd*) -@@ -24980,7 +25337,10 @@ for cc_temp in $compiler""; do +@@ -24980,7 +25340,10 @@ for cc_temp in $compiler""; do *) break;; esac done @@ -1325,7 +1334,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ # GCJ did not exist at the time GCC didn't implicitly link libc in. -@@ -25100,9 +25460,16 @@ lt_prog_compiler_static_GCJ= +@@ -25100,9 +25463,16 @@ lt_prog_compiler_static_GCJ= ;; darwin* | rhapsody*) @@ -1343,7 +1352,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; haiku*) -@@ -25130,6 +25497,13 @@ lt_prog_compiler_static_GCJ= +@@ -25130,6 +25500,13 @@ lt_prog_compiler_static_GCJ= # Instead, we relocate shared libraries at runtime. ;; @@ -1357,7 +1366,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -25282,6 +25656,15 @@ lt_prog_compiler_static_GCJ= +@@ -25282,6 +25659,15 @@ lt_prog_compiler_static_GCJ= esac ;; @@ -1373,7 +1382,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ newsos6) lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' -@@ -25357,6 +25740,9 @@ lt_prog_compiler_static_GCJ= +@@ -25357,6 +25743,9 @@ lt_prog_compiler_static_GCJ= case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: @@ -1383,7 +1392,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ *djgpp*) lt_prog_compiler_pic_GCJ= ;; -@@ -25887,16 +26273,28 @@ _LT_EOF +@@ -25887,16 +26276,28 @@ _LT_EOF fi ;; @@ -1418,7 +1427,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ solaris*) if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ld_shlibs_GCJ=no -@@ -26305,7 +26703,7 @@ fi +@@ -26305,7 +26706,7 @@ fi allow_undefined_flag_GCJ="$_lt_dar_allow_undefined" case $cc_basename in ifort*) _lt_dar_can_shared=yes ;; @@ -1427,7 +1436,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ esac if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=func_echo_all -@@ -26478,13 +26876,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -26478,13 +26879,25 @@ $as_echo "$lt_cv_irix_exported_symbol" > link_all_deplibs_GCJ=yes ;; @@ -1458,7 +1467,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ hardcode_direct_GCJ=yes hardcode_shlibpath_var_GCJ=no ;; -@@ -26498,6 +26908,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -26498,6 +26911,11 @@ $as_echo "$lt_cv_irix_exported_symbol" > ;; *nto* | *qnx*) @@ -1470,7 +1479,7 @@ $NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $ ;; openbsd*) -@@ -27075,7 +27490,10 @@ for cc_temp in $compiler""; do +@@ -27075,7 +27493,10 @@ for cc_temp in $compiler""; do *) break;; esac done diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad index 6c87c0c2e35..3903ca48e7c 100644 --- a/devel/libtool/patches/patch-ad +++ b/devel/libtool/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.41 2013/04/12 13:44:08 joerg Exp $ +$NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $ ---- libltdl/configure.orig 2013-03-03 13:53:50.000000000 +0000 +--- libltdl/configure.orig 2011-10-17 10:19:47.000000000 +0000 +++ libltdl/configure @@ -5042,12 +5042,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all @@ -36,6 +36,15 @@ $NetBSD: patch-ad,v 1.41 2013/04/12 13:44:08 joerg Exp $ ;; openbsd*) +@@ -5686,7 +5693,7 @@ fi + + case $host_os in + darwin*) +- lock_old_archive_extraction=yes ;; ++ lock_old_archive_extraction=no ;; # work around bug #14579 + *) + lock_old_archive_extraction=no ;; + esac @@ -7843,7 +7850,10 @@ for cc_temp in $compiler""; do *) break;; esac |