summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcostan <costan@google.com>2017-07-13 03:13:54 -0700
committerVictor Costan <pwnall@chromium.org>2017-07-13 03:56:49 -0700
commit548501c98860bbe46e0eeda53942be67c7decef1 (patch)
tree8d335183f298525eceefc515bfcf4ed03cf67368
parent513df5fb5a2d51146f409141f9eb8736935cc486 (diff)
downloadsnappy-548501c98860bbe46e0eeda53942be67c7decef1.tar.gz
snappy-548501c98860bbe46e0eeda53942be67c7decef1.tar.bz2
snappy-548501c98860bbe46e0eeda53942be67c7decef1.zip
zippy: Re-release snappy 1.1.5 as 1.1.6.
The migration from autotools to CMake in 1.1.5 wasn't as smooth as intended. The SONAME / SOVERSION were broken in both build systems, causing breakages in systems that upgraded from snappy 1.1.4 to 1.1.5, as reported in https://github.com/Homebrew/homebrew-core/issues/15274 and https://github.com/google/snappy/pull/45.
-rw-r--r--CMakeLists.txt5
-rw-r--r--NEWS11
-rw-r--r--configure.ac4
3 files changed, 16 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c79e46..de52666 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
-PROJECT(Snappy VERSION 1.1.5 LANGUAGES C CXX)
+PROJECT(Snappy VERSION 1.1.6 LANGUAGES C CXX)
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -107,7 +107,8 @@ INSTALL(TARGETS snappy
ARCHIVE DESTINATION lib)
INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION lib/cmake/Snappy)
-SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION})
+SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
+ SOVERSION ${PROJECT_VERSION_MAJOR})
SET(INCLUDE_INSTALL_DIR include)
SET(LIBRARY_INSTALL_DIR lib)
diff --git a/NEWS b/NEWS
index 9c65957..8aeafd7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
+Snappy v1.1.6, July 12th 2017:
+
+This is a re-release of v1.1.5 with proper SONAME / SOVERSION values.
+
Snappy v1.1.5, June 28th 2017:
+This release has broken SONAME / SOVERSION values. Users of snappy as a shared
+library should avoid 1.1.5 and use 1.1.6 instead. SONAME / SOVERSION errors will
+manifest as the dynamic library loader complaining that it cannot find snappy's
+shared library file (libsnappy.so / libsnappy.dylib), or that the library it
+found does not have the required version. 1.1.6 has the same code as 1.1.5, but
+carries build configuration fixes for the issues above.
+
* Add CMake build support. The autoconf build support is now deprecated, and
will be removed in the next release.
diff --git a/configure.ac b/configure.ac
index fd1e8f0..595826e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
m4_define([snappy_major], [1])
m4_define([snappy_minor], [1])
-m4_define([snappy_patchlevel], [5])
+m4_define([snappy_patchlevel], [6])
# Libtool shared library interface versions (current:revision:age)
# Update this value for every release! (A:B:C will map to foo.so.(A-C).C.B)
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-m4_define([snappy_ltversion], [4:1:4])
+m4_define([snappy_ltversion], [2:6:1])
AC_INIT([snappy], [snappy_major.snappy_minor.snappy_patchlevel])
AC_CONFIG_MACRO_DIR([m4])