diff options
author | tv <tv> | 2004-10-08 17:37:50 +0000 |
---|---|---|
committer | tv <tv> | 2004-10-08 17:37:50 +0000 |
commit | 9b74c97fdc9d506610c52749f37f8ea47f926db6 (patch) | |
tree | d8073a83aa931e08c031a7e791eb873c0108fb9a /devel/libtool | |
parent | dd617b50e91b6863bd34d2ec8434c6d7c36bc4b8 (diff) | |
download | pkgsrc-9b74c97fdc9d506610c52749f37f8ea47f926db6.tar.gz |
nb2: Make the "echo" substitute work on Interix. Noted by
Hiramatsu Yoshifumi <hiramatu@boreas.dti.ne.jp> in PR pkg/27182.
Diffstat (limited to 'devel/libtool')
-rw-r--r-- | devel/libtool/distinfo | 6 | ||||
-rw-r--r-- | devel/libtool/patches/manual-libtool.m4 | 16 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 16 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ad | 16 |
4 files changed, 48 insertions, 6 deletions
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index e2af779ba68..cb7ebdb711b 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.46 2004/10/04 19:48:09 tv Exp $ +$NetBSD: distinfo,v 1.47 2004/10/08 17:37:50 tv Exp $ SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e Size (libtool-1.5.10.tar.gz) = 2699923 bytes SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e -SHA1 (patch-ab) = 7b6db6dc7f57bd5425542e156308793a52729c58 +SHA1 (patch-ab) = 18e8a4ebf8bc165d3eb94a3e9856a672239dab7c SHA1 (patch-ac) = e5cb5ca2303ebb82bb17db6c785580c23db2c6d3 -SHA1 (patch-ad) = a2d0742ff45539b06c346b8bee8e04645441e266 +SHA1 (patch-ad) = e9ad9e7c5cfb3b7c9a966a1909f2ffba5e8b493e diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4 index 6a7eeaaf7f9..83305f4fa09 100644 --- a/devel/libtool/patches/manual-libtool.m4 +++ b/devel/libtool/patches/manual-libtool.m4 @@ -1,7 +1,21 @@ -$NetBSD: manual-libtool.m4,v 1.6 2004/10/04 19:48:09 tv Exp $ +$NetBSD: manual-libtool.m4,v 1.7 2004/10/08 17:37:50 tv Exp $ --- libtool.m4.orig 2004-09-19 08:15:08.000000000 -0400 +++ libtool.m4 +@@ -361,11 +361,11 @@ else + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. +- echo='print -r' ++ echo='print -r -' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. @@ -1201,6 +1201,7 @@ beos*) bsdi[[45]]*) version_type=linux diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 4333598f580..1b674463374 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,7 +1,21 @@ -$NetBSD: patch-ab,v 1.41 2004/10/04 19:48:09 tv Exp $ +$NetBSD: patch-ab,v 1.42 2004/10/08 17:37:50 tv Exp $ --- configure.orig 2004-09-19 08:22:04.000000000 -0400 +++ configure +@@ -322,11 +322,11 @@ else + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. +- echo='print -r' ++ echo='print -r -' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. @@ -4534,6 +4534,10 @@ hpux10.20* | hpux11*) esac ;; diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad index c716ce2749b..b2f34fcf9e7 100644 --- a/devel/libtool/patches/patch-ad +++ b/devel/libtool/patches/patch-ad @@ -1,7 +1,21 @@ -$NetBSD: patch-ad,v 1.14 2004/10/04 19:48:09 tv Exp $ +$NetBSD: patch-ad,v 1.15 2004/10/08 17:37:50 tv Exp $ --- libltdl/configure.orig 2004-09-19 08:23:09.000000000 -0400 +++ libltdl/configure +@@ -322,11 +322,11 @@ else + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. +- echo='print -r' ++ echo='print -r -' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. @@ -3739,6 +3739,10 @@ hpux10.20* | hpux11*) esac ;; |