diff options
Diffstat (limited to 'devel/libtool')
-rw-r--r-- | devel/libtool/distinfo | 4 | ||||
-rw-r--r-- | devel/libtool/patches/manual-libtool.m4 | 7 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 28 |
3 files changed, 22 insertions, 17 deletions
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 781830f05bc..527066031bb 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.79 2009/12/18 22:11:10 joerg Exp $ +$NetBSD: distinfo,v 1.80 2010/03/17 10:59:44 markd Exp $ SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55 RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef Size (libtool-2.2.6b.tar.gz) = 2347317 bytes SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751 -SHA1 (patch-ab) = 7b88703844ca0b2906b1ad81a431a4bfc125445e +SHA1 (patch-ab) = 39bce4c6a4bcfb9f6e20c06742e2a9897f40cac8 SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65 SHA1 (patch-ad) = 51ede8bef293d566cd359efa52e6cd04f4a380ec diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4 index 3de1666e9b0..63632286103 100644 --- a/devel/libtool/patches/manual-libtool.m4 +++ b/devel/libtool/patches/manual-libtool.m4 @@ -1,4 +1,4 @@ -$NetBSD: manual-libtool.m4,v 1.29 2009/12/17 00:53:52 joerg Exp $ +$NetBSD: manual-libtool.m4,v 1.30 2010/03/17 10:59:45 markd Exp $ --- libltdl/m4/libtool.m4.orig 2008-09-05 13:54:41.000000000 +0200 +++ libltdl/m4/libtool.m4 @@ -104,9 +104,10 @@ $NetBSD: manual-libtool.m4,v 1.29 2009/12/17 00:53:52 joerg Exp $ + version_type=linux need_lib_prefix=no need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 43a574fa949..b6e60e3dadb 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.67 2009/12/18 22:11:10 joerg Exp $ +$NetBSD: patch-ab,v 1.68 2010/03/17 10:59:45 markd Exp $ The last two chunks work around bugs in ksh on NetBSD. The problem manifests with wl and no_builtin_flag containing newlines. ---- configure.orig 2009-12-17 01:29:54.000000000 +0100 +--- configure.orig 2009-11-16 13:14:55.000000000 +0000 +++ configure @@ -5293,6 +5293,13 @@ else lt_cv_sys_max_cmd_len=8192; @@ -171,9 +171,10 @@ The problem manifests with wl and no_builtin_flag containing newlines. + version_type=linux need_lib_prefix=no need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else @@ -389,9 +390,10 @@ The problem manifests with wl and no_builtin_flag containing newlines. + version_type=linux need_lib_prefix=no need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else @@ -560,9 +562,10 @@ The problem manifests with wl and no_builtin_flag containing newlines. + version_type=linux need_lib_prefix=no need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else @@ -731,9 +734,10 @@ The problem manifests with wl and no_builtin_flag containing newlines. + version_type=linux need_lib_prefix=no need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else @@ -838,7 +842,7 @@ The problem manifests with wl and no_builtin_flag containing newlines. lt_cv_prog_compiler_c_o_RC=yes -@@ -24427,6 +24441,9 @@ +@@ -24296,6 +24429,9 @@ LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' @@ -848,7 +852,7 @@ The problem manifests with wl and no_builtin_flag containing newlines. # Quote evaled strings. for var in SED \ GREP \ -@@ -24711,6 +24729,9 @@ +@@ -24580,6 +24716,9 @@ case \$lt_ECHO in ;; esac |