179 lines
7.7 KiB
Diff
179 lines
7.7 KiB
Diff
|
diff -Naurd corosync-0.94.orig/exec/Makefile corosync-0.94/exec/Makefile
|
||
|
|
--- corosync-0.94.orig/exec/Makefile 2009-02-19 03:23:58.000000000 +0100
|
||
|
|
+++ corosync-0.94/exec/Makefile 2009-03-03 05:49:45.000000000 +0100
|
||
|
|
@@ -73,7 +73,7 @@
|
||
|
|
EXEC_OBJS = $(MAIN_OBJS)
|
||
|
|
override CFLAGS += -fPIC
|
||
|
|
|
||
|
|
-all:libtotem_pg.a libtotem_pg.so.2.0.0 liblogsys.a liblogsys.so.2.0.0 \
|
||
|
|
+all:libtotem_pg.a libtotem_pg.so.3.0.0 liblogsys.a liblogsys.so.3.0.0 \
|
||
|
|
../lcr/lcr_ifact.o corosync_ \
|
||
|
|
objdb.lcrso vsf_ykd.lcrso coroparse.lcrso vsf_quorum.lcrso
|
||
|
|
else
|
||
|
|
@@ -125,18 +125,18 @@
|
||
|
|
|
||
|
|
ifeq (${COROSYNC_COMPAT}, DARWIN)
|
||
|
|
|
||
|
|
-libtotem_pg.so.2.0.0: $(TOTEM_OBJS)
|
||
|
|
+libtotem_pg.so.3.0.0: $(TOTEM_OBJS)
|
||
|
|
$(CC) $(LDFLAGS) -bundle -bind_at_load $(TOTEM_OBJS) -o $@
|
||
|
|
|
||
|
|
-liblogsys.so.2.0.0: $(LOGSYS_OBJS)
|
||
|
|
+liblogsys.so.3.0.0: $(LOGSYS_OBJS)
|
||
|
|
$(CC) $(LDFLAGS) -bundle -bind_at_load $(LOGSYS_OBJS) -o $@
|
||
|
|
else
|
||
|
|
|
||
|
|
-libtotem_pg.so.2.0.0: $(TOTEM_OBJS)
|
||
|
|
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.2 $(TOTEM_OBJS) -o $@
|
||
|
|
+libtotem_pg.so.3.0.0: $(TOTEM_OBJS)
|
||
|
|
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libtotem_pg.so.3 $(TOTEM_OBJS) -o $@
|
||
|
|
|
||
|
|
-liblogsys.so.2.0.0: $(LIBLOGSYS_OBJS)
|
||
|
|
- $(CC) -shared -Wl,-soname,liblogsys.so.2 $(LOGSYS_OBJS) -o $@ $(LDFLAGS)
|
||
|
|
+liblogsys.so.3.0.0: $(LIBLOGSYS_OBJS)
|
||
|
|
+ $(CC) -shared -Wl,-soname,liblogsys.so.3 $(LOGSYS_OBJS) -o $@ $(LDFLAGS)
|
||
|
|
|
||
|
|
endif
|
||
|
|
|
||
|
|
diff -Naurd corosync-0.94.orig/lib/Makefile corosync-0.94/lib/Makefile
|
||
|
|
--- corosync-0.94.orig/lib/Makefile 2009-02-19 03:23:58.000000000 +0100
|
||
|
|
+++ corosync-0.94/lib/Makefile 2009-03-03 05:49:45.000000000 +0100
|
||
|
|
@@ -37,14 +37,14 @@
|
||
|
|
|
||
|
|
override LDFLAGS += -L./
|
||
|
|
|
||
|
|
-all: libcpg.a libcpg.so.2.0.0 \
|
||
|
|
- libconfdb.a libconfdb.so.2.0.0 \
|
||
|
|
- libevs.a libevs.so.2.0.0 \
|
||
|
|
- libcfg.a libcfg.so.2.0.0 \
|
||
|
|
- libquorum.a libquorum.so.2.0.0 \
|
||
|
|
- libpload.a libpload.so.2.0.0 \
|
||
|
|
- libcoroipc.a libcoroipc.so.2.0.0 \
|
||
|
|
- libvotequorum.a libvotequorum.so.2.0.0
|
||
|
|
+all: libcpg.a libcpg.so.3.0.0 \
|
||
|
|
+ libconfdb.a libconfdb.so.3.0.0 \
|
||
|
|
+ libevs.a libevs.so.3.0.0 \
|
||
|
|
+ libcfg.a libcfg.so.3.0.0 \
|
||
|
|
+ libquorum.a libquorum.so.3.0.0 \
|
||
|
|
+ libpload.a libpload.so.3.0.0 \
|
||
|
|
+ libcoroipc.a libcoroipc.so.3.0.0 \
|
||
|
|
+ libvotequorum.a libvotequorum.so.3.0.0
|
||
|
|
|
||
|
|
libcoroipc.a: coroipc.o
|
||
|
|
$(AR) -rc libcoroipc.a coroipc.o
|
||
|
|
@@ -52,55 +52,55 @@
|
||
|
|
ifeq (${COROSYNC_COMPAT}, DARWIN)
|
||
|
|
|
||
|
|
DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 2.0.0 -compatibility_version 2.0.0
|
||
|
|
-libcoroipc.so.2.0.0: coroipc.o
|
||
|
|
+libcoroipc.so.3.0.0: coroipc.o
|
||
|
|
$(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o -o $@
|
||
|
|
|
||
|
|
-libevs.so.2.0.0: coroipc.o evs.o
|
||
|
|
+libevs.so.3.0.0: coroipc.o evs.o
|
||
|
|
$(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o evs.o -o $@
|
||
|
|
|
||
|
|
-libcpg.so.2.0.0: coroipc.o cpg.o
|
||
|
|
+libcpg.so.3.0.0: coroipc.o cpg.o
|
||
|
|
$(CC) $(DARWIN_OPTS) coroipc.o cpg.o -o $@
|
||
|
|
|
||
|
|
-libquorum.so.2.0.0: coroipc.o quorum.o
|
||
|
|
+libquorum.so.3.0.0: coroipc.o quorum.o
|
||
|
|
$(CC) $(DARWIN_OPTS) coroipc.o quorum.o -o $@
|
||
|
|
|
||
|
|
-libvotequorum.so.2.0.0: coroipc.o votequorum.o
|
||
|
|
+libvotequorum.so.3.0.0: coroipc.o votequorum.o
|
||
|
|
$(CC) $(DARWIN_OPTS) coroipc.o votequorum.o -o $@
|
||
|
|
|
||
|
|
-libconfdb.so.2.0.0: coroipc.o confdb.o sa-confdb.o
|
||
|
|
+libconfdb.so.3.0.0: coroipc.o confdb.o sa-confdb.o
|
||
|
|
$(CC) $(LDFLAGS) $(DARWIN_OPTS) coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@
|
||
|
|
|
||
|
|
-libcfg.so.2.0.0: coroipc.o cfg.o
|
||
|
|
+libcfg.so.3.0.0: coroipc.o cfg.o
|
||
|
|
$(CC) $(DARWIN_OPTS) coroipc.o cfg.o -o $@
|
||
|
|
|
||
|
|
-libpload.so.2.0.0: coroipc.o pload.o
|
||
|
|
+libpload.so.3.0.0: coroipc.o pload.o
|
||
|
|
$(CC) $(DARWIN_OPTS) coroipc.o pload.o -o $@
|
||
|
|
|
||
|
|
else
|
||
|
|
|
||
|
|
-libcoroipc.so.2.0.0: coroipc.o
|
||
|
|
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libcoroipc.so.2,-version-script=$(srcdir)$(subdir)libcoroipc.versions coroipc.o -o $@
|
||
|
|
+libcoroipc.so.3.0.0: coroipc.o
|
||
|
|
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libcoroipc.so.3,-version-script=$(srcdir)$(subdir)libcoroipc.versions coroipc.o -o $@
|
||
|
|
|
||
|
|
-libevs.so.2.0.0: coroipc.o evs.o
|
||
|
|
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.2,-version-script=$(srcdir)$(subdir)libevs.versions coroipc.o evs.o -o $@
|
||
|
|
+libevs.so.3.0.0: coroipc.o evs.o
|
||
|
|
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.3,-version-script=$(srcdir)$(subdir)libevs.versions coroipc.o evs.o -o $@
|
||
|
|
|
||
|
|
-libcpg.so.2.0.0: coroipc.o cpg.o
|
||
|
|
- $(CC) -shared -Wl,-soname,libcpg.so.2,-version-script=$(srcdir)$(subdir)libcpg.versions coroipc.o cpg.o -o $@
|
||
|
|
+libcpg.so.3.0.0: coroipc.o cpg.o
|
||
|
|
+ $(CC) -shared -Wl,-soname,libcpg.so.3,-version-script=$(srcdir)$(subdir)libcpg.versions coroipc.o cpg.o -o $@
|
||
|
|
|
||
|
|
-libquorum.so.2.0.0: coroipc.o quorum.o
|
||
|
|
- $(CC) -shared -Wl,-soname,libquorum.so.2,-version-script=$(srcdir)$(subdir)libquorum.versions coroipc.o quorum.o -o $@
|
||
|
|
+libquorum.so.3.0.0: coroipc.o quorum.o
|
||
|
|
+ $(CC) -shared -Wl,-soname,libquorum.so.3,-version-script=$(srcdir)$(subdir)libquorum.versions coroipc.o quorum.o -o $@
|
||
|
|
|
||
|
|
-libvotequorum.so.2.0.0: coroipc.o votequorum.o
|
||
|
|
- $(CC) -shared -Wl,-soname,libvotequorum.so.2,-version-script=$(srcdir)$(subdir)libvotequorum.versions coroipc.o votequorum.o -o $@
|
||
|
|
+libvotequorum.so.3.0.0: coroipc.o votequorum.o
|
||
|
|
+ $(CC) -shared -Wl,-soname,libvotequorum.so.3,-version-script=$(srcdir)$(subdir)libvotequorum.versions coroipc.o votequorum.o -o $@
|
||
|
|
|
||
|
|
-libconfdb.so.2.0.0: coroipc.o confdb.o sa-confdb.o
|
||
|
|
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libconfdb.so.2,-version-script=$(srcdir)$(subdir)libconfdb.versions coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@
|
||
|
|
+libconfdb.so.3.0.0: coroipc.o confdb.o sa-confdb.o
|
||
|
|
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libconfdb.so.3,-version-script=$(srcdir)$(subdir)libconfdb.versions coroipc.o confdb.o sa-confdb.o ../lcr/lcr_ifact.o -o $@
|
||
|
|
|
||
|
|
-libcfg.so.2.0.0: coroipc.o cfg.o
|
||
|
|
- $(CC) -shared -Wl,-soname,libcfg.so.2,-version-script=$(srcdir)$(subdir)libcfg.versions coroipc.o cfg.o -o $@
|
||
|
|
+libcfg.so.3.0.0: coroipc.o cfg.o
|
||
|
|
+ $(CC) -shared -Wl,-soname,libcfg.so.3,-version-script=$(srcdir)$(subdir)libcfg.versions coroipc.o cfg.o -o $@
|
||
|
|
|
||
|
|
-libpload.so.2.0.0: coroipc.o pload.o
|
||
|
|
- $(CC) -shared -Wl,-soname,libpload.so.2,-version-script=$(srcdir)$(subdir)libpload.versions coroipc.o cfg.o -o $@
|
||
|
|
+libpload.so.3.0.0: coroipc.o pload.o
|
||
|
|
+ $(CC) -shared -Wl,-soname,libpload.so.3,-version-script=$(srcdir)$(subdir)libpload.versions coroipc.o cfg.o -o $@
|
||
|
|
|
||
|
|
endif
|
||
|
|
|
||
|
|
diff -Naurd corosync-0.94.orig/Makefile corosync-0.94/Makefile
|
||
|
|
--- corosync-0.94.orig/Makefile 2009-02-25 05:58:08.000000000 +0100
|
||
|
|
+++ corosync-0.94/Makefile 2009-03-03 05:49:45.000000000 +0100
|
||
|
|
@@ -133,11 +133,11 @@
|
||
|
|
|
||
|
|
for eLib in $(EXEC_LIBS); do \
|
||
|
|
( cd $(builddir) ; \
|
||
|
|
- ln -sf lib$$eLib.so.2.0.0 exec/lib$$eLib.so; \
|
||
|
|
- ln -sf lib$$eLib.so.2.0.0 exec/lib$$eLib.so.2; \
|
||
|
|
+ ln -sf lib$$eLib.so.3.0.0 exec/lib$$eLib.so; \
|
||
|
|
+ ln -sf lib$$eLib.so.3.0.0 exec/lib$$eLib.so.3; \
|
||
|
|
$(CP) -a exec/lib$$eLib.so $(DESTDIR)$(LIBDIR); \
|
||
|
|
- $(CP) -a exec/lib$$eLib.so.2 $(DESTDIR)$(LIBDIR); \
|
||
|
|
- install -m 755 exec/lib$$eLib.so.2.* $(DESTDIR)$(LIBDIR); \
|
||
|
|
+ $(CP) -a exec/lib$$eLib.so.3 $(DESTDIR)$(LIBDIR); \
|
||
|
|
+ install -m 755 exec/lib$$eLib.so.3.* $(DESTDIR)$(LIBDIR); \
|
||
|
|
if [ "xYES" = "x$(STATICLIBS)" ]; then \
|
||
|
|
install -m 755 exec/lib$$eLib.a $(DESTDIR)$(LIBDIR); \
|
||
|
|
if [ ${COROSYNC_COMPAT} = "DARWIN" ]; then \
|
||
|
|
@@ -149,11 +149,11 @@
|
||
|
|
|
||
|
|
for aLib in $(COROSYNC_LIBS); do \
|
||
|
|
( cd $(builddir) ; \
|
||
|
|
- ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so; \
|
||
|
|
- ln -sf lib$$aLib.so.2.0.0 lib/lib$$aLib.so.2; \
|
||
|
|
+ ln -sf lib$$aLib.so.3.0.0 lib/lib$$aLib.so; \
|
||
|
|
+ ln -sf lib$$aLib.so.3.0.0 lib/lib$$aLib.so.3; \
|
||
|
|
$(CP) -a lib/lib$$aLib.so $(DESTDIR)$(LIBDIR); \
|
||
|
|
- $(CP) -a lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR); \
|
||
|
|
- install -m 755 lib/lib$$aLib.so.2.* $(DESTDIR)$(LIBDIR); \
|
||
|
|
+ $(CP) -a lib/lib$$aLib.so.3 $(DESTDIR)$(LIBDIR); \
|
||
|
|
+ install -m 755 lib/lib$$aLib.so.3.* $(DESTDIR)$(LIBDIR); \
|
||
|
|
if [ "xYES" = "x$(STATICLIBS)" ]; then \
|
||
|
|
install -m 755 lib/lib$$aLib.a $(DESTDIR)$(LIBDIR); \
|
||
|
|
if [ ${COROSYNC_COMPAT} = "DARWIN" ]; then \
|