Fri Feb 22 13:40:30 2013 UTC ()
Use -shared instead of -G on SunOS.

Fixes 64-bit package.


(jperkin)
diff -r1.41 -r1.42 pkgsrc/shells/zsh/distinfo
diff -r1.27 -r1.28 pkgsrc/shells/zsh/patches/patch-ac
cvs diff -r1.41 -r1.42 pkgsrc/shells/zsh/distinfo (switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2013/01/03 15:37:23 1.41
+++ pkgsrc/shells/zsh/distinfo 2013/02/22 13:40:30 1.42
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.41 2013/01/03 15:37:23 ryoon Exp $ 1$NetBSD: distinfo,v 1.42 2013/02/22 13:40:30 jperkin Exp $
2 2
3SHA1 (zsh-5.0.2.tar.bz2) = 9f55ecaaae7cdc1495f91237ba2ec087777a4ad9 3SHA1 (zsh-5.0.2.tar.bz2) = 9f55ecaaae7cdc1495f91237ba2ec087777a4ad9
4RMD160 (zsh-5.0.2.tar.bz2) = eea2328a28e9f022ab9f49583622a9c3bd6114a7 4RMD160 (zsh-5.0.2.tar.bz2) = eea2328a28e9f022ab9f49583622a9c3bd6114a7
5Size (zsh-5.0.2.tar.bz2) = 3025767 bytes 5Size (zsh-5.0.2.tar.bz2) = 3025767 bytes
6SHA1 (patch-ac) = c69a2b8f643f1ef819dec5e738a4c7c0e3acece0 6SHA1 (patch-ac) = dab5b2181f9a09d31cd20ef8e4b175401f323dc9
cvs diff -r1.27 -r1.28 pkgsrc/shells/zsh/patches/Attic/patch-ac (switch to unified diff)

--- pkgsrc/shells/zsh/patches/Attic/patch-ac 2013/01/03 15:37:23 1.27
+++ pkgsrc/shells/zsh/patches/Attic/patch-ac 2013/02/22 13:40:30 1.28
@@ -1,73 +1,82 @@ @@ -1,73 +1,82 @@
1$NetBSD: patch-ac,v 1.27 2013/01/03 15:37:23 ryoon Exp $ 1$NetBSD: patch-ac,v 1.28 2013/02/22 13:40:30 jperkin Exp $
2 2
3First chunk: 3First chunk:
4Add support for thread limits. 4Add support for thread limits.
5From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. 5From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers.
6 6
7All other chunks: 7All other chunks:
8Make this package build on Interix. Patches provided by Hiramatsu 8Make this package build on Interix. Patches provided by Hiramatsu
9Yoshifumi in PR pkg/25946. 9Yoshifumi in PR pkg/25946.
10Last chunk only: 10Last chunk only:
11Don't force -Wl,--whole-archive for NetBSD, it breaks the build with 11Don't force -Wl,--whole-archive for NetBSD, it breaks the build with
12clang, which doesn't have a reason to disable it again. 12clang, which doesn't have a reason to disable it again.
13 13
14All chunks: 14All chunks:
15Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on 15Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
16zsh-workers on 2012-08-16. 16zsh-workers on 2012-08-16.
17 17
18--- configure.orig 2012-09-15 20:13:14.000000000 +0000 18--- configure.orig 2012-09-15 20:13:14.000000000 +0000
19+++ configure 19+++ configure
20@@ -9645,6 +9645,42 @@ if test $zsh_cv_have_RLIMIT_NTHR = yes;  20@@ -9645,6 +9645,42 @@ if test $zsh_cv_have_RLIMIT_NTHR = yes;
21  21
22 fi 22 fi
23  23
24+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NTHR" >&5 24+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NTHR" >&5
25+$as_echo_n "checking for limit RLIMIT_NTHR... " >&6; } 25+$as_echo_n "checking for limit RLIMIT_NTHR... " >&6; }
26+if ${zsh_cv_have_RLIMIT_NTHR+:} false; then : 26+if ${zsh_cv_have_RLIMIT_NTHR+:} false; then :
27+ $as_echo_n "(cached) " >&6 27+ $as_echo_n "(cached) " >&6
28+else 28+else
29+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext 29+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
30+/* end confdefs.h. */ 30+/* end confdefs.h. */
31+ 31+
32+#include <sys/types.h> 32+#include <sys/types.h>
33+#ifdef HAVE_SYS_TIME_H 33+#ifdef HAVE_SYS_TIME_H
34+#include <sys/time.h> 34+#include <sys/time.h>
35+#endif 35+#endif
36+#include <sys/resource.h> 36+#include <sys/resource.h>
37+int 37+int
38+main () 38+main ()
39+{ 39+{
40+RLIMIT_NTHR 40+RLIMIT_NTHR
41+ ; 41+ ;
42+ return 0; 42+ return 0;
43+} 43+}
44+_ACEOF 44+_ACEOF
45+if ac_fn_c_try_compile "$LINENO"; then : 45+if ac_fn_c_try_compile "$LINENO"; then :
46+ zsh_cv_have_RLIMIT_NTHR=yes 46+ zsh_cv_have_RLIMIT_NTHR=yes
47+else 47+else
48+ zsh_cv_have_RLIMIT_NTHR=no 48+ zsh_cv_have_RLIMIT_NTHR=no
49+fi 49+fi
50+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 50+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
51+fi 51+fi
52+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NTHR" >&5 52+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NTHR" >&5
53+$as_echo "$zsh_cv_have_RLIMIT_NTHR" >&6; } 53+$as_echo "$zsh_cv_have_RLIMIT_NTHR" >&6; }
54+ 54+
55+if test $zsh_cv_have_RLIMIT_NTHR = yes; then 55+if test $zsh_cv_have_RLIMIT_NTHR = yes; then
56+ $as_echo "#define HAVE_RLIMIT_NTHR 1" >>confdefs.h 56+ $as_echo "#define HAVE_RLIMIT_NTHR 1" >>confdefs.h
57+ 57+
58+fi 58+fi
59+ 59+
60 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5 60 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5
61 $as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; } 61 $as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; }
62 if ${zsh_cv_have_RLIMIT_NOFILE+:} false; then : 62 if ${zsh_cv_have_RLIMIT_NOFILE+:} false; then :
63@@ -11630,6 +11666,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; } 63@@ -11630,6 +11666,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
64 DLLD="${DLLD=$CC}" 64 DLLD="${DLLD=$CC}"
65 DLLDARG="" 65 DLLDARG=""
66 ;; 66 ;;
67+ *interix*) 67+ *interix*)
68+ DLLD="${DLLD=$CC}" 68+ DLLD="${DLLD=$CC}"
69+ DLLDARG="" 69+ DLLDARG=""
70+ ;; 70+ ;;
71 * ) 71 * )
72 DLLD="${DLLD=ld}" 72 DLLD="${DLLD=ld}"
73 DLLDARG="" 73 DLLDARG=""
 74@@ -11659,7 +11699,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
 75 sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
 76 sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
 77 aix*) DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
 78- solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
 79+ solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
 80 darwin*) DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
 81 beos*|haiku*) DLLDFLAGS="${DLLDFLAGS=-nostart}" ;;
 82 openbsd*)