sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Link with libthr when available. This should fix the CPU consumption

Browse source 
problem.

PR:		ports/119246
Submitted by:	Jarrod Sayers (maintainer)
Approved by:	garga (mentor)
This commit is contained in:
Wesley Shields 2008-01-19 19:44:28 +00:00
parent 85f0e6088d
commit a6cf48b729
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=205847
2 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net-mgmt/nagios-devel/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= nagios
DISTVERSION= 3.0rc1
PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagios

44
net-mgmt/nagios-devel/files/patch-configure.in
View file

@ -1,5 +1,5 @@
--- configure.in.orig Thu Nov 1 04:05:38 2007
+++ configure.in Thu Nov 1 19:33:42 2007
--- configure.in.orig 2007-12-18 04:21:51.000000000 +1030
+++ configure.in 2008-01-02 12:15:05.000000000 +1030
@@ -6,7 +6,6 @@
AC_INIT(base/nagios.c)
@ -7,8 +7,32 @@
-AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nagios
PKG_VERSION="3.0b7"
@@ -196,7 +195,7 @@
PKG_VERSION="3.0rc1"
@@ -119,7 +118,15 @@
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
THREADLIBS=""
have_pthreads="no"
+have_thr="no"
+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
+AC_CHECK_LIB(thr,pthread_create)
+if test $ac_cv_lib_thr_pthread_create = yes; then
+ THREADLIBS="-lthr"
+ have_pthreads="yes"
+ have_thr="yes"
+else
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
AC_DEFUN(AC_PTHREAD_FREEBSD,[
@@ -180,6 +187,7 @@
if test $have_pthreads = "no"; then
AC_PTHREAD_FREEBSD
fi
+fi
AC_SUBST(THREADLIBS)
@@ -196,7 +204,7 @@
AC_SUBST(nagios_grp)
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
@ -17,7 +41,7 @@
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
@@ -520,9 +519,9 @@
@@ -520,9 +528,9 @@
fi
dnl Try and locate glib
@ -29,3 +53,13 @@
AC_SUBST(GLIB_LIBS)
if test x$GLIB_LIBS != x; then
AC_DEFINE_UNQUOTED(HAVE_GLIB)
@@ -667,6 +675,9 @@
AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
+ if test x$have_thr = xyes; then
+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"
+ fi
PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`"
CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`"
USEPERL=yes