[icinga-checkins] icinga.org: icinga-core/rbartels/cgi-current: install: use *. so instead of *.o for solaris, patch in contrib/solaris/ #524

git at icinga.org git at icinga.org
Thu Mar 17 10:56:03 CET 2011


Module: icinga-core
Branch: rbartels/cgi-current
Commit: 0972d817b67149f8730662e7380ab863291edeaf
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0972d817b67149f8730662e7380ab863291edeaf

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Mar 16 09:37:53 2011 +0100

install: use *.so instead of *.o for solaris, patch in contrib/solaris/ #524

fixes #524

---

 Changelog                                          |    1 +
 contrib/solaris/0001-solaris_idomod_so_patch.patch |   96 ++++++++++++++++++++
 2 files changed, 97 insertions(+), 0 deletions(-)

diff --git a/Changelog b/Changelog
index 756260b..6b0b038 100644
--- a/Changelog
+++ b/Changelog
@@ -25,6 +25,7 @@ FIXES
 * classic ui: don't show pause/continue urls on non-refreshable pages
 
 * install: replace configure option --with-checkresults-dir by --with-spool-dir #1224
+* install: use *.so instead of *.o for solaris, patch in contrib/solaris/ #524
 
 
 1.3.0 - 16/02/2011
diff --git a/contrib/solaris/0001-solaris_idomod_so_patch.patch b/contrib/solaris/0001-solaris_idomod_so_patch.patch
new file mode 100644
index 0000000..b0ea302
--- /dev/null
+++ b/contrib/solaris/0001-solaris_idomod_so_patch.patch
@@ -0,0 +1,96 @@
+From 55795099d6ef91c34fbcd019c059f5e9743bb6a4 Mon Sep 17 00:00:00 2001
+From: Michael Friedrich <michael.friedrich at univie.ac.at>
+Date: Wed, 16 Mar 2011 09:28:23 +0100
+Subject: [PATCH] solaris_idomod_so_patch
+
+---
+ module/Makefile.in              |    8 ++++----
+ module/idoutils/src/Makefile.in |   10 +++++-----
+ sample-config/icinga.cfg.in     |    8 ++++----
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/module/Makefile.in b/module/Makefile.in
+index 6de9eb8..3df8f82 100644
+--- a/module/Makefile.in
++++ b/module/Makefile.in
+@@ -23,13 +23,13 @@ STRIP=@STRIP@
+ 
+ CP=@CP@
+ 
+-all:	helloworld.o
++all:	helloworld.so
+ 
+-helloworld.o: helloworld.c
+-	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld.o helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
++helloworld.so: helloworld.c
++	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld.so helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+-	rm -f helloworld.o
++	rm -f helloworld.so
+ 	rm -f core *.o
+ 	rm -f *~ *.*~
+ 
+diff --git a/module/idoutils/src/Makefile.in b/module/idoutils/src/Makefile.in
+index 7fcabfa..f80e84a 100644
+--- a/module/idoutils/src/Makefile.in
++++ b/module/idoutils/src/Makefile.in
+@@ -54,7 +54,7 @@ IDO_OBJS=db.o
+ CP=@CP@
+ 
+ 
+-all: file2sock log2ido ido2db idomod.o sockdebug
++all: file2sock log2ido ido2db idomod.so sockdebug
+ 
+ file2sock: file2sock.c $(COMMON_INC) $(COMMON_OBJS)
+ 	$(CC) $(CFLAGS) -o $@ file2sock.c $(COMMON_OBJS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
+@@ -65,8 +65,8 @@ log2ido: log2ido.c $(COMMON_INC) $(COMMON_OBJS)
+ ido2db: ido2db.c $(IDO_INC) $(IDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers.o dbqueries.o
+ 	$(CC) $(CFLAGS) $(DBCFLAGS) -o ido2db ido2db.c dbhandlers.o dbqueries.o $(COMMON_OBJS) $(IDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(THREADLIBS) $(MATHLIBS) $(OTHERLIBS)
+ 
+-idomod.o: idomod.c $(COMMON_INC) $(COMMON_OBJS)
+-	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o idomod.o idomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
++idomod.so: idomod.c $(COMMON_INC) $(COMMON_OBJS)
++	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o idomod.so idomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
+ 
+ sockdebug: sockdebug.c $(COMMON_INC) $(COMMON_OBJS)
+ 	$(CC) $(CFLAGS) -o $@ sockdebug.c $(COMMON_OBJS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
+@@ -87,7 +87,7 @@ dbqueries.o: dbqueries.c $(SRC_INCLUDE)/dbqueries.h
+ 	$(CC) $(CFLAGS) -c -o $@ dbqueries.c
+ 
+ clean:
+-	rm -f core file2sock log2ido ido2db sockdebug *.o
++	rm -f core file2sock log2ido ido2db sockdebug *.o *.so
+ 	rm -f *~ */*~
+ 
+ distclean: clean
+@@ -99,5 +99,5 @@ install:
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) ido2db $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 774 $(INSTALL_OPTS) log2ido $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 774 $(INSTALL_OPTS) idomod.o $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 774 $(INSTALL_OPTS) idomod.so $(DESTDIR)$(BINDIR)
+ 
+diff --git a/sample-config/icinga.cfg.in b/sample-config/icinga.cfg.in
+index 7cfbb2a..db031c2 100644
+--- a/sample-config/icinga.cfg.in
++++ b/sample-config/icinga.cfg.in
+@@ -240,11 +240,11 @@ event_broker_options=-1
+ #
+ #   broker_module=<modulepath> [moduleargs]
+ 
+-#broker_module=/somewhere/module1.o
+-#broker_module=/somewhere/module2.o arg1 arg2=3 debug=0
++#broker_module=/somewhere/module1.so
++#broker_module=/somewhere/module2.so arg1 arg2=3 debug=0
+ 
+-# Uncomment this to enable idomod.o
+-#broker_module=@bindir@/idomod.o config_file=@sysconfdir@/idomod.cfg
++# Uncomment this to enable idomod.so
++#broker_module=@bindir@/idomod.so config_file=@sysconfdir@/idomod.cfg
+ 
+ 
+ 
+-- 
+1.7.1.1
+





More information about the icinga-checkins mailing list