On 16/03/10 06:09, Steven Dake wrote:
On Mon, 2010-03-15 at 13:15 +0000, Christine Caulfield wrote:
On 12/03/10 14:52, Steven Dake wrote:
Chrissie,
The first patch needs the addition of a minor version change for
libconfdb. Take a look at how Honza did that same work for libcpg.
Chrissie,
The patch is nearly correct, but I'd like the minor version changed
rather then micro. (while at it, add support for changing micro too:)
Example:
Major version change - incompatible DSO change
Minor version change - compatible DSO change that adds functionality
Micro version change - compatible DSO change that fixes a library bug
I know adding this for each library is a pain, so perhaps you can focus
on just confdb for the moment.
Ahh sorry,
Here's a corrected patch
Chrissie
Index: configure.ac
===================================================================
--- configure.ac (revision 2682)
+++ configure.ac (working copy)
@@ -173,9 +173,12 @@
SOMINOR="0"
SOMICRO="0"
SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"
-# Special for libcpg
+# Special for libcpg & libconfdb
CPG_SOMICRO="1"
CPG_SONAME="${SOMAJOR}.${SOMINOR}.${CPG_SOMICRO}"
+CONFDB_SOMICRO="0"
+CONFDB_SOMINOR="1"
+CONFDB_SONAME="${SOMAJOR}.${CONFDB_SOMINOR}.${CONFDB_SOMICRO}"
# local options
AC_ARG_ENABLE([ansi],
@@ -433,6 +436,7 @@
AC_SUBST([SOMICRO])
AC_SUBST([SONAME])
AC_SUBST([CPG_SONAME])
+AC_SUBST([CONFDB_SONAME])
AC_SUBST([OS_DYFLAGS])
@@ -483,6 +487,7 @@
AC_MSG_RESULT([$PACKAGE build info:])
AC_MSG_RESULT([ Library SONAME = ${SONAME}])
AC_MSG_RESULT([ CPG Library SONAME = ${CPG_SONAME}])
+AC_MSG_RESULT([ CONFDB Library SONAME = ${CONFDB_SONAME}])
AC_MSG_RESULT([ Default optimization = ${OPT_CFLAGS}])
AC_MSG_RESULT([ Default debug options = ${GDB_CFLAGS}])
AC_MSG_RESULT([ Extra compiler warnings = ${EXTRA_WARNING}])
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am (revision 2682)
+++ lib/Makefile.am (working copy)
@@ -40,7 +40,8 @@
lib_LIBRARIES = libcpg.a libconfdb.a libevs.a libcfg.a libquorum.a \
libvotequorum.a libpload.a libcoroipcc.a libsam.a
-SHARED_LIBS = $(filter-out libcpg.so.$(SONAME),
$(lib_LIBRARIES:%.a=%.so.$(SONAME))) libcpg.so.$(CPG_SONAME)
+SHARED_LIBS = $(filter-out libcpg.so.$(SONAME)
libconfdb.so.$(SONAME), $(lib_LIBRARIES:%.a=%.so.$(SONAME))) \
+ libcpg.so.$(CPG_SONAME) libconfdb.so.$(CONFDB_SONAME)
SHARED_LIBS_SO = $(lib_LIBRARIES:%.a=%.so)
SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
@@ -71,11 +72,11 @@
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so.$(SOMAJOR)
-libconfdb.so.$(SONAME): confdb.o sa-confdb.o libcoroipcc.so.$(SONAME)
+libconfdb.so.$(CONFDB_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)
+ ln -sf libconfdb.so.$(CONFDB_SONAME) libconfdb.so
+ ln -sf libconfdb.so.$(CONFDB_SONAME) libconfdb.so.$(SOMAJOR)
libcpg.so.$(CPG_SONAME): cpg.o libcoroipcc.so.$(SONAME)
$(CC) $(DARWIN_OPTS) $^ -o $@
@@ -96,11 +97,11 @@
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so.$(SOMAJOR)
-libconfdb.so.$(SONAME): confdb.o sa-confdb.o libcoroipcc.so.$(SONAME)
+libconfdb.so.$(CONFDB_SONAME): confdb.o sa-confdb.o libcoroipcc.so.$(SONAME)
$(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G 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)
+ ln -sf libconfdb.so.$(CONFDB_SONAME) libconfdb.so
+ ln -sf libconfdb.so.$(CONFDB_SONAME) libconfdb.so.$(SOMAJOR)
libcpg.so.$(CPG_SONAME): cpg.o libcoroipcc.so.$(SONAME)
$(LD) $(SOLARIS_OPTS) -G $^ -o $@
@@ -122,13 +123,13 @@
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so
ln -sf libcoroipcc.so.$(SONAME) libcoroipcc.so.$(SOMAJOR)
-libconfdb.so.$(SONAME): confdb.o sa-confdb.o ../lcr/lcr_ifact.o
libcoroipcc.so.$(SONAME)
+libconfdb.so.$(CONFDB_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 \
$^ $(LDFLAGS) $(OS_DYFLAGS) $(OS_LDL) $(AM_LDFLAGS)
- ln -sf libconfdb.so.$(SONAME) libconfdb.so
- ln -sf libconfdb.so.$(SONAME) libconfdb.so.$(SOMAJOR)
+ ln -sf libconfdb.so.$(CONFDB_SONAME) libconfdb.so
+ ln -sf libconfdb.so.$(CONFDB_SONAME) libconfdb.so.$(SOMAJOR)
libcpg.so.$(CPG_SONAME): cpg.o libcoroipcc.so.$(SONAME)
$(CC) -shared -o $@ \
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
