diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-05-12 13:17:01 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-05-12 13:17:01 +0000 |
| commit | 8f4c12d8d43856c43f6d3c35222567bb7aebcf46 (patch) | |
| tree | aff4ce57f9959610acd8d49f85d06a2658f0b33d /devel/binutils | |
| parent | 8a97e137a47ee8fabfadc3187d175f2516915bcc (diff) | |
| download | pkgsrc-8f4c12d8d43856c43f6d3c35222567bb7aebcf46.tar.gz | |
Handle 256 file descriptor limit in 32-bit SunOS environment.
Bump PKGREVISION.
Diffstat (limited to 'devel/binutils')
| -rw-r--r-- | devel/binutils/Makefile | 3 | ||||
| -rw-r--r-- | devel/binutils/distinfo | 4 | ||||
| -rw-r--r-- | devel/binutils/patches/patch-bfd_cache.c | 30 |
3 files changed, 31 insertions, 6 deletions
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index a549b4b6c55..64204b724c1 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2014/05/12 12:49:59 marino Exp $ +# $NetBSD: Makefile,v 1.59 2014/05/12 13:17:01 jperkin Exp $ DISTNAME= binutils-2.24 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=binutils/} diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo index 9f402465a6c..7d8b8a0dd72 100644 --- a/devel/binutils/distinfo +++ b/devel/binutils/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2014/05/12 12:49:59 marino Exp $ +$NetBSD: distinfo,v 1.17 2014/05/12 13:17:01 jperkin Exp $ SHA1 (binutils-2.24.tar.bz2) = 7ac75404ddb3c4910c7594b51ddfc76d4693debb RMD160 (binutils-2.24.tar.bz2) = b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d Size (binutils-2.24.tar.bz2) = 22716802 bytes SHA1 (patch-aa) = 1a127f82c807cbd1ac6fee073c618f3fb48667f6 -SHA1 (patch-bfd_cache.c) = 14848eb2bfafb0eddd3328bded305131dec42488 +SHA1 (patch-bfd_cache.c) = 5f98b965514286c8110516dd665924709708e78c SHA1 (patch-configure.ac) = 7bd7b90e57d850705286f2cc6464ecc45e0657c0 SHA1 (patch-gas_config_tc-i386.c) = 16b04ee6c3c46db375c883b4338bf5d796174458 SHA1 (patch-gold_Makefile.in) = e65a81557c49a168e6bbd966e37ce1ad4be34d72 diff --git a/devel/binutils/patches/patch-bfd_cache.c b/devel/binutils/patches/patch-bfd_cache.c index 3ce1bdd936b..96d89993ff4 100644 --- a/devel/binutils/patches/patch-bfd_cache.c +++ b/devel/binutils/patches/patch-bfd_cache.c @@ -1,18 +1,42 @@ -$NetBSD: patch-bfd_cache.c,v 1.1 2014/01/08 21:04:15 jperkin Exp $ +$NetBSD: patch-bfd_cache.c,v 1.2 2014/05/12 13:17:01 jperkin Exp $ Fix sign-compare on SunOS. +Handle 256 file descriptor limit in 32-bit SunOS environment. --- bfd/cache.c.orig 2013-11-04 15:33:37.000000000 +0000 +++ bfd/cache.c -@@ -82,7 +82,11 @@ bfd_cache_max_open (void) +@@ -51,6 +51,10 @@ SUBSECTION + #include <sys/mman.h> + #endif + ++#if defined(__sun) && !defined(_LP64) ++#include <limits.h> ++#endif ++ + /* In some cases we can optimize cache operation when reopening files. + For instance, a flush is entirely unnecessary if the file is already + closed, so a flush would use CACHE_NO_OPEN. Similarly, a seek using +@@ -81,8 +85,13 @@ bfd_cache_max_open (void) + int max; #ifdef HAVE_GETRLIMIT struct rlimit rlim; - if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 +#ifdef __sun ++ if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 + && rlim.rlim_cur != (rlim_t)RLIM_INFINITY) +#else + if (getrlimit (RLIMIT_NOFILE, &rlim) == 0 && rlim.rlim_cur != RLIM_INFINITY) +#endif max = rlim.rlim_cur / 8; else #endif /* HAVE_GETRLIMIT */ +@@ -91,6 +100,9 @@ bfd_cache_max_open (void) + #else + max = 10; + #endif /* _SC_OPEN_MAX */ ++#if defined(__sun) && !defined(_LP64) ++ max = max > (OPEN_MAX / 8) ? (OPEN_MAX / 8) : max; ++#endif + max_open_files = max < 10 ? 10 : max; + } + |