diff options
| author | Antonio Russo <[email protected]> | 2020-10-31 08:39:58 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-11-03 09:24:43 -0800 |
| commit | 71ae6a9d232de59534e4337efb0dc85c7d6906bd (patch) | |
| tree | 9e03531418f630754fb48d2e9e62809c5abe66a1 /lib | |
| parent | 181b2adc2a8686fb0c300769b8db7ccc5e635c36 (diff) | |
Synchronize library ABI levels
Bump library SOVERSION under Linux to match FreeBSD's.
Additionally, this bump properly accounts for the ABI changes relative
to ZoL 0.8.5 for the Linux build.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Antonio Russo <[email protected]>
Issue #11144
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libnvpair/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/libuutil/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/libzfs/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/libzfs_core/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/libzpool/Makefile.am | 5 |
5 files changed, 6 insertions, 17 deletions
diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am index ec16c5d52..f23ac3cdf 100644 --- a/lib/libnvpair/Makefile.am +++ b/lib/libnvpair/Makefile.am @@ -37,8 +37,4 @@ if !ASAN_ENABLED libnvpair_la_LDFLAGS += -Wl,-z,defs endif -if BUILD_FREEBSD libnvpair_la_LDFLAGS += -version-info 3:0:0 -else -libnvpair_la_LDFLAGS += -version-info 1:1:0 -endif diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am index 8d9b32e44..4bce1609f 100644 --- a/lib/libuutil/Makefile.am +++ b/lib/libuutil/Makefile.am @@ -27,8 +27,4 @@ if !ASAN_ENABLED libuutil_la_LDFLAGS += -Wl,-z,defs endif -if BUILD_FREEBSD libuutil_la_LDFLAGS += -version-info 3:0:0 -else -libuutil_la_LDFLAGS += -version-info 1:1:0 -endif diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index f88fb828d..bfa5b2a1f 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -84,10 +84,9 @@ endif if BUILD_FREEBSD libzfs_la_LIBADD += -lutil -lgeom -libzfs_la_LDFLAGS += -version-info 4:0:0 -else -libzfs_la_LDFLAGS += -version-info 2:0:0 endif +libzfs_la_LDFLAGS += -version-info 4:0:0 + # Licensing data EXTRA_DIST = THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am index e94ba85d2..fb44f1b19 100644 --- a/lib/libzfs_core/Makefile.am +++ b/lib/libzfs_core/Makefile.am @@ -23,7 +23,6 @@ endif if BUILD_FREEBSD libzfs_core_la_LIBADD += -lutil -lgeom -libzfs_core_la_LDFLAGS += -version-info 3:0:0 -else -libzfs_core_la_LDFLAGS += -version-info 1:0:0 endif + +libzfs_core_la_LDFLAGS += -version-info 3:0:0 diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 992c21cc1..d427bda36 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -226,11 +226,10 @@ endif if BUILD_FREEBSD libzpool_la_LIBADD += -lgeom -libzpool_la_LDFLAGS += -version-info 4:0:0 -else -libzpool_la_LDFLAGS += -version-info 2:0:0 endif +libzpool_la_LDFLAGS += -version-info 4:0:0 + if TARGET_CPU_POWERPC vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec |