blob: 5c39fb001b14c737457a2c89172dedcaef13b656 [file] [log] [blame]
Andrew Geissler635e0e42020-08-21 15:58:33 -05001From c3a068cf24a22bea7349849ec111ae8d91a54db4 Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -05002From: 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
Patrick Williamsc124f4f2015-09-15 14:41:29 -05006Upstream-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
Andrew Geissler82c905d2020-04-13 13:39:40 -050013---
Andrew Geissler635e0e42020-08-21 15:58:33 -050014 src/Makefile | 11 ++---------
15 1 file changed, 2 insertions(+), 9 deletions(-)
Andrew Geissler82c905d2020-04-13 13:39:40 -050016
17diff --git a/src/Makefile b/src/Makefile
Andrew Geissler635e0e42020-08-21 15:58:33 -050018index 5b1a5a2..b686394 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050019--- a/src/Makefile
20+++ b/src/Makefile
Andrew Geissler635e0e42020-08-21 15:58:33 -050021@@ -97,15 +97,8 @@ else
Patrick Williamsc124f4f2015-09-15 14:41:29 -050022 endif
23
24 # Additional libs for GNU libc.
Andrew Geissler635e0e42020-08-21 15:58:33 -050025-ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
Andrew Geissler82c905d2020-04-13 13:39:40 -050026- SULOGINLIBS += -lcrypt
27-endif
28-
29-# Additional libs for GNU libc / multiarch on Debian based systems.
Andrew Geissler635e0e42020-08-21 15:58:33 -050030-ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),)
31-ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt)
Andrew Geissler82c905d2020-04-13 13:39:40 -050032- SULOGINLIBS += -lcrypt
Andrew Geissler635e0e42020-08-21 15:58:33 -050033-endif
Patrick Williamsc124f4f2015-09-15 14:41:29 -050034+ifneq ($(LCRYPT),)
35+ SULOGINLIBS += $(LCRYPT)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050036 endif
Patrick Williamsc124f4f2015-09-15 14:41:29 -050037
38 all: $(BIN) $(SBIN) $(USRBIN)