summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2013-09-26 13:44:10 -0400
committerBrian Behlendorf <[email protected]>2013-10-10 16:56:51 -0700
commita6ce1eae54ca048ae7e7dfdcad05c5565a129226 (patch)
tree182cb119577a2c9c8db5d04d6daa54cdf05feeef
parent31fc19399e597e3391f19f1392ab120f1de0d5f2 (diff)
Fix libzfs_core changes to follow GNU libtool guidelines
The GNU libtool documentation states to start with a version of 0:0:0, rather than 1:1:0. Illumos uses the name libzfs_core.so.1, so to be consistent, we should go with 1:0:0. http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info The GNU libtool documentation also provides guidence on how the version information should be incremented. Doing this does a SONAME bump of the libzfs and libzpool libraries. This is particularly important on Gentoo because a SONAME bump enables portage to retain the older libraries until any packages that link to them are rebuilt. The main example of this is GRUB2's grub2-mkconfig, which will break unless it is rebuilt against the new libraries. Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #1751
-rw-r--r--lib/libzfs/Makefile.am2
-rw-r--r--lib/libzfs_core/Makefile.am2
-rw-r--r--lib/libzpool/Makefile.am2
-rw-r--r--rpm/generic/zfs.spec.in2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
index 75f1775a2..8b1f51782 100644
--- a/lib/libzfs/Makefile.am
+++ b/lib/libzfs/Makefile.am
@@ -28,4 +28,4 @@ libzfs_la_LIBADD = \
$(top_builddir)/lib/libzpool/libzpool.la
libzfs_la_LIBADD += -lm -ldl $(LIBBLKID)
-libzfs_la_LDFLAGS = -version-info 1:1:0
+libzfs_la_LDFLAGS = -version-info 2:0:0
diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
index d8e2061ac..0ecd2085c 100644
--- a/lib/libzfs_core/Makefile.am
+++ b/lib/libzfs_core/Makefile.am
@@ -12,4 +12,4 @@ libzfs_core_la_SOURCES = \
libzfs_core_la_LIBADD = \
$(top_builddir)/lib/libnvpair/libnvpair.la
-libzfs_core_la_LDFLAGS = -version-info 1:1:0
+libzfs_core_la_LDFLAGS = -version-info 1:0:0
diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index 32221694a..da81659d2 100644
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -100,7 +100,7 @@ libzpool_la_LIBADD = \
$(top_builddir)/lib/libnvpair/libnvpair.la
libzpool_la_LIBADD += $(ZLIB)
-libzpool_la_LDFLAGS = -version-info 1:1:0
+libzpool_la_LDFLAGS = -version-info 2:0:0
EXTRA_DIST = \
$(top_srcdir)/module/zfs/vdev_disk.c \
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 079712479..a836a5f5f 100644
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -131,7 +131,7 @@ exit 0
%doc OPENSOLARIS.LICENSE README.markdown
%{_sbindir}/*
%{_bindir}/*
-%{_libdir}/*.so.1*
+%{_libdir}/*.so.*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man8/*