emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

libsubid: fix defining SONAME version

Browse Source 
We were overriding this when --enable-shared was passed. We can actually
just dump the conditional logic as libtool will do the right thing for
us here anyway.

Without this patch, libsubid is installed as .0.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2021-12-20 01:37:23 +00:00
parent 868d7b34ea
commit e0d66b4be1
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -321,8 +321,6 @@ if test "$with_sha_crypt" = "yes"; then
AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms]) AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
fi fi
AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes")
AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes") AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes")
if test "$with_bcrypt" = "yes"; then if test "$with_bcrypt" = "yes"; then
AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm]) AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm])

6
libsubid/Makefile.am
View File

@ -1,10 +1,6 @@
lib_LTLIBRARIES = libsubid.la lib_LTLIBRARIES = libsubid.la
if ENABLE_SHARED
libsubid_la_LDFLAGS = -Wl,-soname,libsubid.so.@LIBSUBID_ABI@ \
-shared -version-info @LIBSUBID_ABI_MAJOR@
endif
libsubid_la_SOURCES = api.c libsubid_la_SOURCES = api.c
libsubid_la_LDFLAGS = -export-symbols-regex '^subid_' libsubid_la_LDFLAGS = -version-info @LIBSUBID_ABI_MAJOR@ -export-symbols-regex '^subid_'
pkginclude_HEADERS = subid.h pkginclude_HEADERS = subid.h