[pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install/files Stop doing...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf29170494a2
branches:  pkg_install-renovation
changeset: 541557:bf29170494a2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jun 12 15:16:41 2008 +0000

description:
Stop doing the rlimit dance. Last time I checked, the dependency graph
had a depth around 17. Given that ISO C allows at least 20 open streams,
that should be good enough on all systems.

diffstat:

 pkgtools/pkg_install/files/add/main.c   |   21 +------
 pkgtools/pkg_install/files/configure    |  101 --------------------------------
 pkgtools/pkg_install/files/configure.ac |    1 -
 3 files changed, 2 insertions(+), 121 deletions(-)

diffs (171 lines):

diff -r 881b51af28b2 -r bf29170494a2 pkgtools/pkg_install/files/add/main.c
--- a/pkgtools/pkg_install/files/add/main.c     Wed Jun 04 17:28:48 2008 +0000
+++ b/pkgtools/pkg_install/files/add/main.c     Thu Jun 12 15:16:41 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.14.4.2 2008/05/11 20:20:37 joerg Exp $      */
+/*     $NetBSD: main.c,v 1.14.4.3 2008/06/12 15:16:41 joerg Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.16 1997/10/08 07:45:43 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.14.4.2 2008/05/11 20:20:37 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.14.4.3 2008/06/12 15:16:41 joerg Exp $");
 #endif
 #endif
 
@@ -76,7 +76,6 @@
 {
        int     ch, error=0;
        lpkg_head_t pkgs;
-       struct rlimit rlim;
        int rc;
 
        setprogname(argv[0]);
@@ -174,22 +173,6 @@
 
                TAILQ_INSERT_TAIL(&pkgs, lpp, lp_link);
        }
-       
-       /* Increase # of max. open file descriptors as high as possible */
-       /* XXX: Why is this necessary? */
-       rc = getrlimit(RLIMIT_NOFILE, &rlim);
-       if (rc == -1) {
-               warn("cannot retrieve max. number of open files resource limit");
-       } else {
-               rlim.rlim_cur = rlim.rlim_max;
-               rc = setrlimit(RLIMIT_NOFILE, &rlim);
-               if (rc == -1) {
-                       warn("cannot increase max. number of open files resource limit, try 'ulimit'");
-               } else {
-                       if (Verbose)
-                               printf("increasing RLIMIT_NOFILE to max. %ld open files\n", (long)rlim.rlim_cur);
-               }
-       }
 
        error += pkg_perform(&pkgs);
        if (error != 0) {
diff -r 881b51af28b2 -r bf29170494a2 pkgtools/pkg_install/files/configure
--- a/pkgtools/pkg_install/files/configure      Wed Jun 04 17:28:48 2008 +0000
+++ b/pkgtools/pkg_install/files/configure      Thu Jun 12 15:16:41 2008 +0000
@@ -5177,107 +5177,6 @@
 done
 
 
-
-for ac_func in getrlimit setrlimit
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'`
-              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
-                $as_echo "$as_val"'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
 { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
 $as_echo_n "checking for library containing gethostbyname... " >&6; }
 if test "${ac_cv_search_gethostbyname+set}" = set; then
diff -r 881b51af28b2 -r bf29170494a2 pkgtools/pkg_install/files/configure.ac
--- a/pkgtools/pkg_install/files/configure.ac   Wed Jun 04 17:28:48 2008 +0000
+++ b/pkgtools/pkg_install/files/configure.ac   Thu Jun 12 15:16:41 2008 +0000
@@ -73,7 +73,6 @@
 
 # Checks for library functions.
 AC_CHECK_FUNCS([chflags dbopen __db185_open tgetent vfork])
-AC_CHECK_FUNCS([getrlimit setrlimit])
 
 AC_SEARCH_LIBS([gethostbyname], [nsl])
 AC_SEARCH_LIBS([socket],