mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 17:26:36 +01:00
5e902d8861
(From OE-Core rev: 8608b72182347f9afaf652864cf824a81c005f25) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From f040b04c50d13755b2063c4db0e0be0647cf5d14 Mon Sep 17 00:00:00 2001
|
|
From: Jeff Dike <jdike@x86_64.user-mode-linux.org>
|
|
Date: Wed, 14 Jul 2010 14:35:52 -0400
|
|
Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a
|
|
|
|
The src Makefile was checking for libcrypt.a on the host, not in the
|
|
build environment. This patch checks for $LCRYPT in the environment
|
|
and uses it if it's there.
|
|
jdike@linux.intel.com
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
---
|
|
src/Makefile | 12 ++----------
|
|
1 file changed, 2 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index 6d9f01c..b12a233 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -97,16 +97,8 @@ else
|
|
SULOGINLIBS =
|
|
endif
|
|
|
|
-# Additional libs for GNU libc.
|
|
-ifneq ($(wildcard $(ROOT)/$(usrdir)/lib*/libcrypt.*),)
|
|
- SULOGINLIBS += -lcrypt
|
|
-endif
|
|
-
|
|
-# Additional libs for GNU libc / multiarch on Debian based systems.
|
|
-ifneq ($(wildcard $(ROOT)/$(usrdir)/lib/*/libcrypt.*),)
|
|
-ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt)
|
|
- SULOGINLIBS += -lcrypt
|
|
-endif
|
|
+ifneq ($(LCRYPT),)
|
|
+ SULOGINLIBS += $(LCRYPT)
|
|
endif
|
|
|
|
all: $(BIN) $(SBIN) $(USRBIN)
|