Title: [opsview-base] [210] Updated patch so that works for main Nagios code now.
- Revision
- 210
- Author
- tvoon
- Date
- 2013-02-07 16:56:21 +0000 (Thu, 07 Feb 2013)
Log Message
Updated patch so that works for main Nagios code now. The previous patch
only fixed the tools
Modified Paths
Modified: trunk/patches/nagios_solaris_uses_select.patch
===================================================================
--- trunk/patches/nagios_solaris_uses_select.patch 2013-02-05 10:03:33 UTC (rev 209)
+++ trunk/patches/nagios_solaris_uses_select.patch 2013-02-07 16:56:21 UTC (rev 210)
@@ -1,12 +1,13 @@
-diff -ur nagios-4.0.20130107-orig/lib/Makefile.in nagios-4.0.20130107/lib/Makefile.in
---- nagios-4.0.20130107-orig/lib/Makefile.in 2012-12-24 15:29:25.000000000 +0000
-+++ nagios-4.0.20130107/lib/Makefile.in 2013-02-05 09:26:20.000000000 +0000
-@@ -2,7 +2,7 @@
+diff -ur nagios-4.0.20130107.original//lib/Makefile.in nagios-4.0.20130107/lib/Makefile.in
+--- nagios-4.0.20130107.original//lib/Makefile.in 2012-12-24 15:29:25.000000000 +0000
++++ nagios-4.0.20130107/lib/Makefile.in 2013-02-07 16:55:21.000000000 +0000
+@@ -1,7 +1,8 @@
+ CC = gcc
COV_CFLAGS = -ggdb3 -O0 -ftest-coverage -fprofile-arcs -pg
LDFLAGS =
- CFLAGS ?= @CFLAGS@
--ALL_CFLAGS = -Wall $(CFLAGS) @DEFS@
-+ALL_CFLAGS = -Wall -DIOBROKER_USES_SELECT $(CFLAGS) @DEFS@
+-CFLAGS ?= @CFLAGS@
++# Need to set IOBROKER_USES_SELECT as Solaris does not have EPOLL
++CFLAGS ?= -DIOBROKER_USES_SELECT @CFLAGS@
+ ALL_CFLAGS = -Wall $(CFLAGS) @DEFS@
LIBNAME = libnagios.a
- all: $(LIBNAME)
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
