blob: bd4444b81ba69d7572eddb04dccff25de48fd3cd [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From 7276275d9a08d5ae268fb263027bbc60bc0ab2e8 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
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---
14 src/Makefile | 9 ++-------
15 1 file changed, 2 insertions(+), 7 deletions(-)
16
17diff --git a/src/Makefile b/src/Makefile
18index 1380d7f..628e77f 100644
19--- a/src/Makefile
20+++ b/src/Makefile
21@@ -97,13 +97,8 @@ else
Patrick Williamsc124f4f2015-09-15 14:41:29 -050022 endif
23
24 # Additional libs for GNU libc.
Andrew Geissler82c905d2020-04-13 13:39:40 -050025-ifneq ($(wildcard /usr/lib*/libcrypt.*),)
26- SULOGINLIBS += -lcrypt
27-endif
28-
29-# Additional libs for GNU libc / multiarch on Debian based systems.
30-ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
31- SULOGINLIBS += -lcrypt
Patrick Williamsc124f4f2015-09-15 14:41:29 -050032+ifneq ($(LCRYPT),)
33+ SULOGINLIBS += $(LCRYPT)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050034 endif
Patrick Williamsc124f4f2015-09-15 14:41:29 -050035
36 all: $(BIN) $(SBIN) $(USRBIN)