emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try harder to find libcrypt.*, even if there is no static library

Browse Source 
available.  Also look in /usr/lib/*/ for the library, to handle
Debian multiarch systems.  Based on patch from Andrew Gregory.
This commit is contained in:
Petter Reinholdtsen 2014-01-25 21:57:25 +00:00
parent 45660f6ee6
commit d2f82534cf
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/Changelog
View File

@ -56,6 +56,9 @@ sysvinit (2.89dsf) UNRELEASED; urgency=low
* Rename internal functions warn() and shutdown() in the shutdown * Rename internal functions warn() and shutdown() in the shutdown
binary to avoid surprising dynamic library name resolution binary to avoid surprising dynamic library name resolution
conflict with NSS modules. Patch from Richard Tollerton. conflict with NSS modules. Patch from Richard Tollerton.
* Try harder to find libcrypt.*, even if there is no static library
available. Also look in /usr/lib/*/ for the library, to handle
Debian multiarch systems. Based on patch from Andrew Gregory.
-- Petter Reinholdtsen <pere@hungry.com> Sun Apr 11 11:28:55 CEST 2010 -- Petter Reinholdtsen <pere@hungry.com> Sun Apr 11 11:28:55 CEST 2010

7
src/Makefile
View File

@ -89,7 +89,12 @@ else
endif endif
# Additional libs for GNU libc. # Additional libs for GNU libc.
ifneq ($(wildcard /usr/lib*/libcrypt.a),) ifneq ($(wildcard /usr/lib*/libcrypt.*),)
SULOGINLIBS += -lcrypt
endif
# Additional libs for GNU libc / multiarch on Debian based systems.
ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
SULOGINLIBS += -lcrypt SULOGINLIBS += -lcrypt
endif endif