Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 1 | From c3a068cf24a22bea7349849ec111ae8d91a54db4 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Jeff Dike <jdike@x86_64.user-mode-linux.org> |
| 3 | Date: Wed, 14 Jul 2010 14:35:52 -0400 |
| 4 | Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a |
| 5 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 6 | Upstream-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 Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 13 | --- |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 14 | src/Makefile | 11 ++--------- |
| 15 | 1 file changed, 2 insertions(+), 9 deletions(-) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 16 | |
| 17 | diff --git a/src/Makefile b/src/Makefile |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 18 | index 5b1a5a2..b686394 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | --- a/src/Makefile |
| 20 | +++ b/src/Makefile |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 21 | @@ -97,15 +97,8 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | endif |
| 23 | |
| 24 | # Additional libs for GNU libc. |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 25 | -ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 26 | - SULOGINLIBS += -lcrypt |
| 27 | -endif |
| 28 | - |
| 29 | -# Additional libs for GNU libc / multiarch on Debian based systems. |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 30 | -ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),) |
| 31 | -ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 32 | - SULOGINLIBS += -lcrypt |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 33 | -endif |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 34 | +ifneq ($(LCRYPT),) |
| 35 | + SULOGINLIBS += $(LCRYPT) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 36 | endif |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 37 | |
| 38 | all: $(BIN) $(SBIN) $(USRBIN) |