summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
Diffstat (limited to 'shells')
-rw-r--r--shells/zsh/patches/patch-ac64
1 files changed, 7 insertions, 57 deletions
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index 7ccfb2c9d87..d5dc5047d95 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,71 +1,21 @@
-$NetBSD: patch-ac,v 1.29 2013/05/10 01:17:33 riastradh Exp $
+$NetBSD: patch-ac,v 1.30 2014/06/25 08:38:37 wiz Exp $
-First chunk:
-Add support for thread limits.
-From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers.
-Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
-zsh-workers on 2012-08-16.
-
-Middle chunks:
+First chunks:
Use a compile test, not a run test, for whether various rlimit values
are equivalent. A compile test is sufficient because zsh uses these
values in switch cases, so they must be compile-time, if not
preprocessor-time, constants.
-Last chunk:
+Last-but-one chunk:
Make this package build on Interix. Patches provided by Hiramatsu
Yoshifumi in PR pkg/25946.
-Last chunk only:
-Don't force -Wl,--whole-archive for NetBSD, it breaks the build with
-clang, which doesn't have a reason to disable it again.
-Accepted by Peter Stephenson <p.w.stephenson@ntlworld.com> on
-zsh-workers on 2012-08-16.
+
+Last chunk:
+Use -shared instead of -G on SunOS.
+Fixes 64-bit package.
--- configure.orig 2012-09-15 20:13:14.000000000 +0000
+++ configure
-@@ -9645,6 +9645,42 @@ if test $zsh_cv_have_RLIMIT_NTHR = yes;
-
- fi
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NTHR" >&5
-+$as_echo_n "checking for limit RLIMIT_NTHR... " >&6; }
-+if ${zsh_cv_have_RLIMIT_NTHR+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <sys/types.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+#include <sys/resource.h>
-+int
-+main ()
-+{
-+RLIMIT_NTHR
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ zsh_cv_have_RLIMIT_NTHR=yes
-+else
-+ zsh_cv_have_RLIMIT_NTHR=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NTHR" >&5
-+$as_echo "$zsh_cv_have_RLIMIT_NTHR" >&6; }
-+
-+if test $zsh_cv_have_RLIMIT_NTHR = yes; then
-+ $as_echo "#define HAVE_RLIMIT_NTHR 1" >>confdefs.h
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5
- $as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; }
- if ${zsh_cv_have_RLIMIT_NOFILE+:} false; then :
@@ -10011,9 +10047,6 @@ $as_echo_n "checking if RLIMIT_VMEM and
if ${zsh_cv_rlimit_vmem_is_rss+:} false; then :
$as_echo_n "(cached) " >&6