Hi Steven,
unless I can find a way to port openais to autoconf before monday
morning EU time, I'll commit this patch to trunk before 0.94 release.
It bumps the soname as agreed to 3.0 and fixes the soname= invokation at
linking time.
Fabio
Index: services/Makefile
===================================================================
--- services/Makefile (revision 1754)
+++ services/Makefile (working copy)
@@ -105,37 +105,37 @@
else
service_clm.lcrso: clm.o
- $(CC) -shared -Wl,-soname,service_clm.lcrso clm.o -o $@
+ $(CC) -shared -Wl,-soname=service_clm.lcrso clm.o -o $@
service_amf.lcrso: $(AMF_OBJS)
- $(CC) -shared -Wl,-soname,service_amf.lcrso $(AMF_OBJS) -o $@
+ $(CC) -shared -Wl,-soname=service_amf.lcrso $(AMF_OBJS) -o $@
service_ckpt.lcrso: ckpt.o
- $(CC) -shared -Wl,-soname,service_ckpt.lcrso ckpt.o -o $@
+ $(CC) -shared -Wl,-soname=service_ckpt.lcrso ckpt.o -o $@
service_evt.lcrso: evt.o
- $(CC) -shared -Wl,-soname,service_evt.lcrso evt.o -o $@
+ $(CC) -shared -Wl,-soname=service_evt.lcrso evt.o -o $@
service_lck.lcrso: lck.o
- $(CC) -shared -Wl,-soname,service_lck.lcrso lck.o -o $@
+ $(CC) -shared -Wl,-soname=service_lck.lcrso lck.o -o $@
service_msg.lcrso: msg.o
- $(CC) -shared -Wl,-soname,service_msg.lcrso msg.o -o $@
+ $(CC) -shared -Wl,-soname=service_msg.lcrso msg.o -o $@
service_cfg.lcrso: cfg.o
- $(CC) -shared -Wl,-soname,service_cfg.lcrso cfg.o -o $@
+ $(CC) -shared -Wl,-soname=service_cfg.lcrso cfg.o -o $@
service_tmr.lcrso: tmr.o
- $(CC) -shared -Wl,-soname,service_tmr.lcrso tmr.o -o $@
+ $(CC) -shared -Wl,-soname=service_tmr.lcrso tmr.o -o $@
openaisparser.lcrso: openaisparser.o
- $(CC) -shared -Wl,-soname,openaisparser.lcrso openaisparser.o -o $@
+ $(CC) -shared -Wl,-soname=openaisparser.lcrso openaisparser.o -o $@
openaisserviceenable.lcrso: openaisserviceenable.o
- $(CC) -shared -Wl,-soname,openaisserviceenable.lcrso openaisserviceenable.o -o $@
+ $(CC) -shared -Wl,-soname=openaisserviceenable.lcrso openaisserviceenable.o -o $@
vsf_ykd.lcrso: vsf_ykd.o
- $(CC) -shared -Wl,-soname,vsf_ykd.lcrso vsf_ykd.o -o $@
+ $(CC) -shared -Wl,-soname=vsf_ykd.lcrso vsf_ykd.o -o $@
endif
Index: lib/Makefile
===================================================================
--- lib/Makefile (revision 1754)
+++ lib/Makefile (working copy)
@@ -38,89 +38,89 @@
override LDFLAGS += -L./ -L$(COROSYNCLIBDIR)
-all: libSaClm.a libSaClm.so.2.0.0 \
- libSaCkpt.a libSaCkpt.so.2.0.0 \
- libSaAmf.a libSaAmf.so.2.0.0 \
- libSaEvt.a libSaEvt.so.2.0.0 \
- libSaMsg.a libSaMsg.so.2.0.0 \
- libSaLck.a libSaLck.so.2.0.0 \
- libSaTmr.a libSaTmr.so.2.0.0
+all: libSaClm.a libSaClm.so.3.0.0 \
+ libSaCkpt.a libSaCkpt.so.3.0.0 \
+ libSaAmf.a libSaAmf.so.3.0.0 \
+ libSaEvt.a libSaEvt.so.3.0.0 \
+ libSaMsg.a libSaMsg.so.3.0.0 \
+ libSaLck.a libSaLck.so.3.0.0 \
+ libSaTmr.a libSaTmr.so.3.0.0
ifeq (${OPENAIS_COMPAT}, DARWIN)
-DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 2.0.0 -compatibility_version 2.0.0
+DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 3.0.0 -compatibility_version 3.0.0
-libSaAmf.so.2.0.0: util.o amf.o
+libSaAmf.so.3.0.0: util.o amf.o
$(CC) $(DARWIN_OPTS) amf.o -o $@
- ln -sf libSaAmf.so.2.0.0 libSaAmf.so.2
- ln -sf libSaAmf.so.2.0.0 libSaAmf.so
+ ln -sf libSaAmf.so.3.0.0 libSaAmf.so.3
+ ln -sf libSaAmf.so.3.0.0 libSaAmf.so
-libSaClm.so.2.0.0: util.o clm.o
+libSaClm.so.3.0.0: util.o clm.o
$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o clm.o -lcoroipc -o $@
- ln -sf libSaClm.so.2.0.0 libSaClm.so.2
- ln -sf libSaClm.so.2.0.0 libSaClm.so
+ ln -sf libSaClm.so.3.0.0 libSaClm.so.3
+ ln -sf libSaClm.so.3.0.0 libSaClm.so
-libSaCkpt.so.2.0.0: util.o ckpt.o
+libSaCkpt.so.3.0.0: util.o ckpt.o
$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o ckpt.o -lcoroipc -o $@
- ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so.2
- ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so
+ ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so.3
+ ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so
-libSaEvt.so.2.0.0: util.o evt.o
+libSaEvt.so.3.0.0: util.o evt.o
$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o evt.o -lcoroipc -o $@
- ln -sf libSaEvt.so.2.0.0 libSaEvt.so.2
- ln -sf libSaEvt.so.2.0.0 libSaEvt.so
+ ln -sf libSaEvt.so.3.0.0 libSaEvt.so.3
+ ln -sf libSaEvt.so.3.0.0 libSaEvt.so
-libSaMsg.so.2.0.0: util.o msg.o
+libSaMsg.so.3.0.0: util.o msg.o
$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o msg.o -lcoroipc -o $@
- ln -sf libSaMsg.so.2.0.0 libSaMsg.so.2
- ln -sf libSaMsg.so.2.0.0 libSaMsg.so
+ ln -sf libSaMsg.so.3.0.0 libSaMsg.so.3
+ ln -sf libSaMsg.so.3.0.0 libSaMsg.so
-libSaLck.so.2.0.0: util.o lck.o
+libSaLck.so.3.0.0: util.o lck.o
$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o lck.o -lcoroipc -o $@
- ln -sf libSaLck.so.2.0.0 libSaLck.so.2
- ln -sf libSaLck.so.2.0.0 libSaLck.so
+ ln -sf libSaLck.so.3.0.0 libSaLck.so.3
+ ln -sf libSaLck.so.3.0.0 libSaLck.so
-libSaTmr.so.2.0.0: util.o tmr.o
+libSaTmr.so.3.0.0: util.o tmr.o
$(CC) $(LDFLAGS) $(DARWIN_OPTS) util.o tmr.o -lcoroipc -o $@
- ln -sf libSaTmr.so.2.0.0 libSaTmr.so.2
- ln -sf libSaTmr.so.2.0.0 libSaTmr.so
+ ln -sf libSaTmr.so.3.0.0 libSaTmr.so.3
+ ln -sf libSaTmr.so.3.0.0 libSaTmr.so
else
-libSaAmf.so.2.0.0: util.o amf.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaAmf.so.2,-version-script=$(srcdir)$(subdir)libSaAmf.versions util.o amf.o -lcoroipc -o $@
- ln -sf libSaAmf.so.2.0.0 libSaAmf.so.2
- ln -sf libSaAmf.so.2.0.0 libSaAmf.so
+libSaAmf.so.3.0.0: util.o amf.o
+ $(CC) $(LDFLAGS) -shared -Wl,-soname=libSaAmf.so.3,-version-script=$(srcdir)$(subdir)libSaAmf.versions util.o amf.o -lcoroipc -o $@
+ ln -sf libSaAmf.so.3.0.0 libSaAmf.so.3
+ ln -sf libSaAmf.so.3.0.0 libSaAmf.so
-libSaClm.so.2.0.0: util.o clm.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.2,-version-script=$(srcdir)$(subdir)libSaClm.versions clm.o util.o -lcoroipc -o $@
- ln -sf libSaClm.so.2.0.0 libSaClm.so.2
- ln -sf libSaClm.so.2.0.0 libSaClm.so
+libSaClm.so.3.0.0: util.o clm.o
+ $(CC) $(LDFLAGS) -shared -Wl,-soname=libSaClm.so.3,-version-script=$(srcdir)$(subdir)libSaClm.versions clm.o util.o -lcoroipc -o $@
+ ln -sf libSaClm.so.3.0.0 libSaClm.so.3
+ ln -sf libSaClm.so.3.0.0 libSaClm.so
-libSaCkpt.so.2.0.0: util.o ckpt.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaCkpt.so.2,-version-script=$(srcdir)$(subdir)libSaCkpt.versions util.o ckpt.o -lcoroipc -o $@
- ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so.2
- ln -sf libSaCkpt.so.2.0.0 libSaCkpt.so
+libSaCkpt.so.3.0.0: util.o ckpt.o
+ $(CC) $(LDFLAGS) -shared -Wl,-soname=libSaCkpt.so.3,-version-script=$(srcdir)$(subdir)libSaCkpt.versions util.o ckpt.o -lcoroipc -o $@
+ ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so.3
+ ln -sf libSaCkpt.so.3.0.0 libSaCkpt.so
-libSaEvt.so.2.0.0: util.o evt.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaEvt.so.2,-version-script=$(srcdir)$(subdir)libSaEvt.versions util.o evt.o -lcoroipc -o $@
- ln -sf libSaEvt.so.2.0.0 libSaEvt.so.2
- ln -sf libSaEvt.so.2.0.0 libSaEvt.so
+libSaEvt.so.3.0.0: util.o evt.o
+ $(CC) $(LDFLAGS) -shared -Wl,-soname=libSaEvt.so.3,-version-script=$(srcdir)$(subdir)libSaEvt.versions util.o evt.o -lcoroipc -o $@
+ ln -sf libSaEvt.so.3.0.0 libSaEvt.so.3
+ ln -sf libSaEvt.so.3.0.0 libSaEvt.so
-libSaMsg.so.2.0.0: util.o msg.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaMsg.so.2,-version-script=$(srcdir)$(subdir)libSaMsg.versions util.o msg.o -lcoroipc -o $@
- ln -sf libSaMsg.so.2.0.0 libSaMsg.so.2
- ln -sf libSaMsg.so.2.0.0 libSaMsg.so
+libSaMsg.so.3.0.0: util.o msg.o
+ $(CC) $(LDFLAGS) -shared -Wl,-soname=libSaMsg.so.3,-version-script=$(srcdir)$(subdir)libSaMsg.versions util.o msg.o -lcoroipc -o $@
+ ln -sf libSaMsg.so.3.0.0 libSaMsg.so.3
+ ln -sf libSaMsg.so.3.0.0 libSaMsg.so
-libSaLck.so.2.0.0: util.o lck.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaLck.so.2,-version-script=$(srcdir)$(subdir)libSaLck.versions util.o lck.o -lcoroipc -o $@
- ln -sf libSaLck.so.2.0.0 libSaLck.so.2
- ln -sf libSaLck.so.2.0.0 libSaLck.so
+libSaLck.so.3.0.0: util.o lck.o
+ $(CC) $(LDFLAGS) -shared -Wl,-soname=libSaLck.so.3,-version-script=$(srcdir)$(subdir)libSaLck.versions util.o lck.o -lcoroipc -o $@
+ ln -sf libSaLck.so.3.0.0 libSaLck.so.3
+ ln -sf libSaLck.so.3.0.0 libSaLck.so
-libSaTmr.so.2.0.0: util.o tmr.o
- $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaTmr.so.2,-version-script=$(srcdir)$(subdir)libSaTmr.versions util.o tmr.o -lcoroipc -o $@
- ln -sf libSaTmr.so.2.0.0 libSaTmr.so.2
- ln -sf libSaTmr.so.2.0.0 libSaTmr.so
+libSaTmr.so.3.0.0: util.o tmr.o
+ $(CC) $(LDFLAGS) -shared -Wl,-soname=libSaTmr.so.3,-version-script=$(srcdir)$(subdir)libSaTmr.versions util.o tmr.o -lcoroipc -o $@
+ ln -sf libSaTmr.so.3.0.0 libSaTmr.so.3
+ ln -sf libSaTmr.so.3.0.0 libSaTmr.so
endif
Index: Makefile
===================================================================
--- Makefile (revision 1754)
+++ Makefile (working copy)
@@ -110,11 +110,11 @@
for aLib in $(AIS_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 [ ${OPENAIS_COMPAT} = "DARWIN" ]; then \
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
