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 #1751
  • Loading branch information
@ryao @behlendorf
ryao authored and behlendorf committed Oct 10, 2013
1 parent 31fc193 commit a6ce1ea
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
View file
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
View file
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

This comment has been minimized.

Sign in to view

Copy link
@dajhorn

dajhorn Nov 6, 2013

Contributor

@ryao, why was the library revision number decremented here?

This comment has been minimized.

Sign in to view

Copy link
@dajhorn

dajhorn Nov 6, 2013

Contributor

// I'm asking because this change caused my local builds to squawk on the apparent downgrade and I don't want to handle this case during a 0.6.2 to 0.6.3 production upgrade. Rather, is this change only cosmetic to make it the same as upstream?

This comment has been minimized.

Sign in to view

Copy link
@behlendorf

behlendorf Nov 6, 2013

Contributor

@dajhorn When the libzfs_core library was merged, which happened post 0.6.2 being tagged, it incorrectly set the library version to 1:1:0. We wanted to roll it back to 1:0:0 for the initial version of the library which will first appear in 0.6.3. There was a span of about 18 commits when it was 1:1:0. So this shouldn't impact updates from 0.6.2 to 0.6.3.

a6ce1ea Fix libzfs_core changes to follow GNU libtool guidelines
31fc193 Generate libraries with correct DT_NEEDED entries
1db7b9b Fix libblkid support
65ee05a Update detach section of zpool(8)
40a806d Export symbols dsl_pool_config_{enter,exit}
222b948 Fix memory leak false positive in log_internal()
3549721 Update drive database
36342b1 Export addition dsl_prop_* symbols
8769db3 Allocate the ioctl "output" nvlist with KM_PUSHPAGE.
c532223 Fix several new KM_SLEEP warnings
cbfa294 Fix spa_deadman() TQ_SLEEP warning
f9f3f1e Removing unneeded mutex for reading vq_pending_tree size
77831e1 Reduce the stack usage of dsl_dataset_remove_clones_key
34d5a5f Fix zpl_mknod() return values
17897ce Fix uninitialized variables
b83e3e4 Stop runtime pointer modifications in autotools checks
4cf652e Fix dmu_objset_find_dp() KM_SLEEP warning
13fe019 Illumos #3464
2 changes: 1 addition & 1 deletion lib/libzpool/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion rpm/generic/zfs.spec.in
View file
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 a6ce1ea

Please sign in to comment.