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.

Regards,
  Honza

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,14 +69,14 @@
 	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
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipcc.o confdb.o \
+libconfdb.so.$(SONAME): confdb.o sa-confdb.o
+	$(CC) $(LDFLAGS) $(DARWIN_OPTS) -L. -lcoroipcc 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
-	$(CC) $(DARWIN_OPTS) $^ -o $@
+lib%.so.$(SONAME): %.o
+	$(CC) $(DARWIN_OPTS) -L. -lcoroipcc $^ -o $@
 	ln -sf lib$*.so.$(SONAME) lib$*.so
 	ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR)
 
@@ -90,19 +90,19 @@
 	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
 	$(CC) -shared -o $@ \
 		-Wl,-soname=libconfdb.so.$(SOMAJOR) \
 		-Wl,-version-script=$(srcdir)/libconfdb.versions \
-		$^ $(LDFLAGS) $(OS_DYFLAGS) -ldl $(AM_LDFLAGS)
+		$^ -L. -lcoroipcc $(LDFLAGS) $(OS_DYFLAGS) -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
 	$(CC) -shared -o $@ \
 		-Wl,-soname=lib$*.so.$(SOMAJOR) \
 		-Wl,-version-script=$(srcdir)/lib$*.versions \
-		$^ $(LDFLAGS) $(AM_LDFLAGS)
+		$^ -L. -lcoroipcc $(LDFLAGS) $(AM_LDFLAGS)
 	ln -sf lib$*.so.$(SONAME) lib$*.so
 	ln -sf lib$*.so.$(SONAME) lib$*.so.$(SOMAJOR)
 
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais

Reply via email to