Skip to content

Commit

Permalink
Fix libzfs_core changes to follow GNU libtool guidelines
Browse files Browse the repository at this point in the history
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 openzfs#1751
  • Loading branch information
ryao authored and unya committed Dec 13, 2013
1 parent 9d8d88e commit bd63fec
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/libzfs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/libzfs_core/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/libzpool/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,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 \
Expand Down
2 changes: 1 addition & 1 deletion rpm/generic/zfs.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ exit 0
%doc OPENSOLARIS.LICENSE README.markdown
%{_sbindir}/*
%{_bindir}/*
%{_libdir}/*.so.1*
%{_libdir}/*.so.*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man8/*
Expand Down

0 comments on commit bd63fec

Please sign in to comment.