1From c3a068cf24a22bea7349849ec111ae8d91a54db4 Mon Sep 17 00:00:00 2001 2From: Jeff Dike <jdike@x86_64.user-mode-linux.org> 3Date: Wed, 14 Jul 2010 14:35:52 -0400 4Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a 5 6Upstream-Status: Inappropriate [configuration] 7 8# The src Makefile was checking for libcrypt.a on the host, not in the 9# build environment. This patch checks for $LCRYPT in the environment 10# and uses it if it's there. 11# - jdike@linux.intel.com 12 13--- 14 src/Makefile | 11 ++--------- 15 1 file changed, 2 insertions(+), 9 deletions(-) 16 17diff --git a/src/Makefile b/src/Makefile 18index 5b1a5a2..b686394 100644 19--- a/src/Makefile 20+++ b/src/Makefile 21@@ -97,15 +97,8 @@ else 22 endif 23 24 # Additional libs for GNU libc. 25-ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),) 26- SULOGINLIBS += -lcrypt 27-endif 28- 29-# Additional libs for GNU libc / multiarch on Debian based systems. 30-ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),) 31-ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt) 32- SULOGINLIBS += -lcrypt 33-endif 34+ifneq ($(LCRYPT),) 35+ SULOGINLIBS += $(LCRYPT) 36 endif 37 38 all: $(BIN) $(SBIN) $(USRBIN) 39