Attached is second version of patch. I tested this 300% more harder then
previous patch, so I hope it will work.
Regards,
Honza
David Teigland wrote:
On Wed, May 27, 2009 at 04:15:52PM +0200, Jan Friesse wrote:
Hi,
included is patch for Makefile.am of corosync, so coroipcc.o is no
longer included in lib... directly, but rather *.so is a dependency, so
ipc_hdb is no longer in multiple *.so and multiple times in binary what
causes problem.
Should solve https://bugzilla.redhat.com/show_bug.cgi?id=499918.
David, can you please confirm, that solved your problem? Thanks.
Still there, but with a new error message,
May 27 16:48:06 bull-01 corosync[5792]: [CKPT ] decrementing node id 2 0
May 27 16:42:04 bull-02 dlm_controld[21981]: retrieve_plocks: ckpt iternext
error 9 x
May 27 16:42:04 bull-02 corosync[21944]: [CKPT ] decrementing node id 2 0
Index: test/Makefile.am
===================================================================
--- test/Makefile.am (revision 2199)
+++ test/Makefile.am (working copy)
@@ -37,33 +37,33 @@
logsysbench logsysrec testquorum testvotequorum1 testvotequorum2 \
logsys_s logsys_t1 logsys_t2 testcpgzc cpgbenchzc testzcgc
-testevs_LDADD = -levs
+testevs_LDADD = -levs -lcoroipcc
testevs_LDFLAGS = -L../lib
-testcpg_LDADD = -lcpg
+testcpg_LDADD = -lcpg -lcoroipcc
testcpg_LDFLAGS = -L../lib
-testcpg2_LDADD = -lcpg
+testcpg2_LDADD = -lcpg -lcoroipcc
testcpg2_LDFLAGS = -L../lib
-testcpgzc_LDADD = -lcpg
+testcpgzc_LDADD = -lcpg -lcoroipcc
testcpgzc_LDFLAGS = -L../lib
-testzcgc_LDADD = -lcpg
+testzcgc_LDADD = -lcpg -lcoroipcc
testzcgc_LDFLAGS = -L../lib
-testconfdb_LDADD = -lconfdb ../lcr/liblcr.a
+testconfdb_LDADD = -lconfdb ../lcr/liblcr.a -lcoroipcc
testconfdb_LDFLAGS = -L../lib
-testquorum_LDADD = -lquorum
+testquorum_LDADD = -lquorum -lcoroipcc
testquorum_LDFLAGS = -L../lib
-testvotequorum1_LDADD = -lvotequorum
+testvotequorum1_LDADD = -lvotequorum -lcoroipcc
testvotequorum1_LDFLAGS = -L../lib
-testvotequorum2_LDADD = -lvotequorum
+testvotequorum2_LDADD = -lvotequorum -lcoroipcc
testvotequorum2_LDFLAGS = -L../lib
-evsverify_LDADD = -levs -ltotem_pg
+evsverify_LDADD = -levs -ltotem_pg -lcoroipcc
evsverify_LDFLAGS = -L../lib -L../exec
-cpgverify_LDADD = -lcpg -ltotem_pg
+cpgverify_LDADD = -lcpg -ltotem_pg -lcoroipcc
cpgverify_LDFLAGS = -L../lib -L../exec
-evsbench_LDADD = -levs
+evsbench_LDADD = -levs -lcoroipcc
evsbench_LDFLAGS = -L../lib
-cpgbench_LDADD = -lcpg
+cpgbench_LDADD = -lcpg -lcoroipcc
cpgbench_LDFLAGS = -L../lib
-cpgbenchzc_LDADD = -lcpg
+cpgbenchzc_LDADD = -lcpg -lcoroipcc
cpgbenchzc_LDFLAGS = -L../lib
logsysbench_LDADD = -llogsys
logsysbench_LDFLAGS = -L../exec
Index: tools/Makefile.am
===================================================================
--- tools/Makefile.am (revision 2199)
+++ tools/Makefile.am (working copy)
@@ -36,9 +36,9 @@
corosync-keygen corosync-objctl \
corosync-pload
-corosync_pload_LDADD = ../lib/libpload.a
-corosync_objctl_LDADD = ../lib/libconfdb.a ../lcr/liblcr.a
-corosync_cfgtool_LDADD = ../lib/libcfg.a
+corosync_pload_LDADD = ../lib/libpload.a ../lib/libcoroipcc.a
+corosync_objctl_LDADD = ../lib/libconfdb.a ../lcr/liblcr.a ../lib/libcoroipcc.a
+corosync_cfgtool_LDADD = ../lib/libcfg.a ../lib/libcoroipcc.a
lint:
-splint $(LINT_FLAGS) $(CFLAGS) *.c
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am (revision 2199)
+++ lib/Makefile.am (working copy)
@@ -44,13 +44,13 @@
SHARED_LIBS_SO = $(lib_LIBRARIES:%.a=%.so)
SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
-libcpg_a_SOURCES = coroipcc.c cpg.c
-libcfg_a_SOURCES = coroipcc.c cfg.c
-libevs_a_SOURCES = coroipcc.c evs.c
-libpload_a_SOURCES = coroipcc.c pload.c
-libquorum_a_SOURCES = coroipcc.c quorum.c
-libvotequorum_a_SOURCES = coroipcc.c votequorum.c
-libconfdb_a_SOURCES = coroipcc.c confdb.c sa-confdb.c
+libcpg_a_SOURCES = cpg.c
+libcfg_a_SOURCES = cfg.c
+libevs_a_SOURCES = evs.c
+libpload_a_SOURCES = pload.c
+libquorum_a_SOURCES = quorum.c
+libvotequorum_a_SOURCES = votequorum.c
+libconfdb_a_SOURCES = confdb.c sa-confdb.c
libcoroipcc_a_SOURCES = coroipcc.c
noinst_HEADERS = sa-confdb.h util.h \
@@ -69,13 +69,13 @@
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so.$(SOMAJOR)
-libconfdb.so.$(SONAME): coroipcc.o confdb.o sa-confdb.o
+libconfdb.so.$(SONAME): confdb.o sa-confdb.o libcoroipcc.so.$(SONAME)
$(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipcc.o confdb.o \
sa-confdb.o ../lcr/lcr_ifact.o -o $@ -ldl $(AM_LDFLAGS)
ln -sf libconfdb.so.$(SONAME) libconfdb.so
ln -sf libconfdb.so.$(SONAME) libconfdb.so.$(SOMAJOR)
-lib%.so.$(SONAME): coroipcc.o %.o
+lib%.so.$(SONAME): %.o libcoroipcc.so.$(SONAME)
$(CC) $(DARWIN_OPTS) $^ -o $@
ln -sf lib$*.so.$(SONAME) lib$*.so
ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR)
@@ -90,7 +90,7 @@
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so.$(SOMAJOR)
-libconfdb.so.$(SONAME): coroipcc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o
+libconfdb.so.$(SONAME): confdb.o sa-confdb.o ../lcr/lcr_ifact.o libcoroipcc.so.$(SONAME)
$(CC) -shared -o $@ \
-Wl,-soname=libconfdb.so.$(SOMAJOR) \
-Wl,-version-script=$(srcdir)/libconfdb.versions \
@@ -98,7 +98,7 @@
ln -sf libconfdb.so.$(SONAME) libconfdb.so
ln -sf libconfdb.so.$(SONAME) libconfdb.so.$(SOMAJOR)
-lib%.so.$(SONAME): coroipcc.o %.o
+lib%.so.$(SONAME): %.o libcoroipcc.so.$(SONAME)
$(CC) -shared -o $@ \
-Wl,-soname=lib$*.so.$(SOMAJOR) \
-Wl,-version-script=$(srcdir)/lib$*.versions \
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
