Skip to content

Commit 1f442af

Browse files
aerussobehlendorf
authored andcommitted
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
1 parent 62d549d commit 1f442af

File tree

5 files changed

+6
-17
lines changed

5 files changed

+6
-17
lines changed

lib/libnvpair/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,4 @@ if !ASAN_ENABLED
3737
libnvpair_la_LDFLAGS += -Wl,-z,defs
3838
endif
3939

40-
if BUILD_FREEBSD
4140
libnvpair_la_LDFLAGS += -version-info 3:0:0
42-
else
43-
libnvpair_la_LDFLAGS += -version-info 1:1:0
44-
endif

lib/libuutil/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,4 @@ if !ASAN_ENABLED
2727
libuutil_la_LDFLAGS += -Wl,-z,defs
2828
endif
2929

30-
if BUILD_FREEBSD
3130
libuutil_la_LDFLAGS += -version-info 3:0:0
32-
else
33-
libuutil_la_LDFLAGS += -version-info 1:1:0
34-
endif

lib/libzfs/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@ endif
8484

8585
if BUILD_FREEBSD
8686
libzfs_la_LIBADD += -lutil -lgeom
87-
libzfs_la_LDFLAGS += -version-info 4:0:0
88-
else
89-
libzfs_la_LDFLAGS += -version-info 2:0:0
9087
endif
9188

89+
libzfs_la_LDFLAGS += -version-info 4:0:0
90+
9291
# Licensing data
9392
EXTRA_DIST = THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip

lib/libzfs_core/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ endif
2323

2424
if BUILD_FREEBSD
2525
libzfs_core_la_LIBADD += -lutil -lgeom
26-
libzfs_core_la_LDFLAGS += -version-info 3:0:0
27-
else
28-
libzfs_core_la_LDFLAGS += -version-info 1:0:0
2926
endif
27+
28+
libzfs_core_la_LDFLAGS += -version-info 3:0:0

lib/libzpool/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,10 @@ endif
226226

227227
if BUILD_FREEBSD
228228
libzpool_la_LIBADD += -lgeom
229-
libzpool_la_LDFLAGS += -version-info 4:0:0
230-
else
231-
libzpool_la_LDFLAGS += -version-info 2:0:0
232229
endif
233230

231+
libzpool_la_LDFLAGS += -version-info 4:0:0
232+
234233
if TARGET_CPU_POWERPC
235234
vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec
236235
vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec

0 commit comments

Comments
 (0)