INN commit: trunk (history/Makefile lib/Makefile storage/Makefile)

INN Commit rra at isc.org
Fri Jul 6 17:54:06 UTC 2012


    Date: Friday, July 6, 2012 @ 10:54:06
  Author: eagle
Revision: 9435

Bump shared library versions

Increase the shared library version for all the shared libraries on
the grounds that we've almost certainly had ABI-breaking changes since
2.5 (which was a long time ago).

Move the shard library versions to near the top of the relevant
Makefiles so that the version is more prominant and document how the
version should be maintained.

Modified:
  trunk/history/Makefile
  trunk/lib/Makefile
  trunk/storage/Makefile

------------------+
 history/Makefile |   10 +++++++++-
 lib/Makefile     |   10 +++++++++-
 storage/Makefile |   10 +++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

Modified: history/Makefile
===================================================================
--- history/Makefile	2012-07-06 17:47:54 UTC (rev 9434)
+++ history/Makefile	2012-07-06 17:54:06 UTC (rev 9435)
@@ -2,6 +2,14 @@
 
 include ../Makefile.global
 
+# This version number should be increased with every change to the library
+# source following the rules laid out in the libtool manual.  This will also
+# force the file name of the shared library to change so that one can
+# recover from make update.  We can't use .BAK extensions for the shared
+# library since ldconfig will think .BAK sorts after the regular library and
+# will point the binaries at the old library.
+LTVERSION     = 3:0:0
+
 top           = ..
 CFLAGS        = $(GCFLAGS) -I.
 
@@ -45,7 +53,7 @@
 libinnhist.la: $(OBJECTS) $(LIBSTORAGE) $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
 	    $(LIBSTORAGE) $(LIBINN) $(STORAGE_LIBS) $(LIBS) \
-	    -rpath $(PATHLIB) -version-info 2:0:0
+	    -rpath $(PATHLIB) -version-info $(LTVERSION)
 
 libinnhist.a: $(OBJECTS)
 	ar r $@ $(OBJECTS)

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2012-07-06 17:47:54 UTC (rev 9434)
+++ lib/Makefile	2012-07-06 17:54:06 UTC (rev 9435)
@@ -2,6 +2,14 @@
 
 include ../Makefile.global
 
+# This version number should be increased with every change to the library
+# source following the rules laid out in the libtool manual.  This will also
+# force the file name of the shared library to change so that one can
+# recover from make update.  We can't use .BAK extensions for the shared
+# library since ldconfig will think .BAK sorts after the regular library and
+# will point the binaries at the old library.
+LTVERSION     = 3:0:0
+
 top	= ..
 CFLAGS  = $(GCFLAGS)
 
@@ -47,7 +55,7 @@
 
 libinn.la: $(OBJECTS) $(LOBJECTS)
 	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) $(LIBS) \
-	    -rpath $(PATHLIB) -version-info 2:0:0
+	    -rpath $(PATHLIB) -version-info $(LTVERSION)
 
 libinn.a: $(OBJECTS)
 	ar r $@ $(OBJECTS)

Modified: storage/Makefile
===================================================================
--- storage/Makefile	2012-07-06 17:47:54 UTC (rev 9434)
+++ storage/Makefile	2012-07-06 17:54:06 UTC (rev 9435)
@@ -2,6 +2,14 @@
 
 include ../Makefile.global
 
+# This version number should be increased with every change to the library
+# source following the rules laid out in the libtool manual.  This will also
+# force the file name of the shared library to change so that one can
+# recover from make update.  We can't use .BAK extensions for the shared
+# library since ldconfig will think .BAK sorts after the regular library and
+# will point the binaries at the old library.
+LTVERSION     = 3:0:0
+
 top	      = ..
 CFLAGS	      = $(GCFLAGS) -I. $(DB_CPPFLAGS)
 
@@ -49,7 +57,7 @@
 libstorage.la: $(OBJECTS) $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \
 	    $(LIBINN) $(STORAGE_LIBS) $(LIBS) \
-	    -rpath $(PATHLIB) -version-info 2:0:0
+	    -rpath $(PATHLIB) -version-info $(LTVERSION)
 
 libstorage.a: $(OBJECTS)
 	ar r $@ $(OBJECTS)



More information about the inn-committers mailing list