diff options
Diffstat (limited to 'meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch')
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch index bd4444b81b..5c39fb001b 100644 --- a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch +++ b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7276275d9a08d5ae268fb263027bbc60bc0ab2e8 Mon Sep 17 00:00:00 2001 | 1 | From c3a068cf24a22bea7349849ec111ae8d91a54db4 Mon Sep 17 00:00:00 2001 |
2 | From: Jeff Dike <jdike@x86_64.user-mode-linux.org> | 2 | From: Jeff Dike <jdike@x86_64.user-mode-linux.org> |
3 | Date: Wed, 14 Jul 2010 14:35:52 -0400 | 3 | Date: Wed, 14 Jul 2010 14:35:52 -0400 |
4 | Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a | 4 | Subject: [PATCH] sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a |
@@ -11,24 +11,26 @@ Upstream-Status: Inappropriate [configuration] | |||
11 | # - jdike@linux.intel.com | 11 | # - jdike@linux.intel.com |
12 | 12 | ||
13 | --- | 13 | --- |
14 | src/Makefile | 9 ++------- | 14 | src/Makefile | 11 ++--------- |
15 | 1 file changed, 2 insertions(+), 7 deletions(-) | 15 | 1 file changed, 2 insertions(+), 9 deletions(-) |
16 | 16 | ||
17 | diff --git a/src/Makefile b/src/Makefile | 17 | diff --git a/src/Makefile b/src/Makefile |
18 | index 1380d7f..628e77f 100644 | 18 | index 5b1a5a2..b686394 100644 |
19 | --- a/src/Makefile | 19 | --- a/src/Makefile |
20 | +++ b/src/Makefile | 20 | +++ b/src/Makefile |
21 | @@ -97,13 +97,8 @@ else | 21 | @@ -97,15 +97,8 @@ else |
22 | endif | 22 | endif |
23 | 23 | ||
24 | # Additional libs for GNU libc. | 24 | # Additional libs for GNU libc. |
25 | -ifneq ($(wildcard /usr/lib*/libcrypt.*),) | 25 | -ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),) |
26 | - SULOGINLIBS += -lcrypt | 26 | - SULOGINLIBS += -lcrypt |
27 | -endif | 27 | -endif |
28 | - | 28 | - |
29 | -# Additional libs for GNU libc / multiarch on Debian based systems. | 29 | -# Additional libs for GNU libc / multiarch on Debian based systems. |
30 | -ifneq ($(wildcard /usr/lib/*/libcrypt.*),) | 30 | -ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),) |
31 | -ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt) | ||
31 | - SULOGINLIBS += -lcrypt | 32 | - SULOGINLIBS += -lcrypt |
33 | -endif | ||
32 | +ifneq ($(LCRYPT),) | 34 | +ifneq ($(LCRYPT),) |
33 | + SULOGINLIBS += $(LCRYPT) | 35 | + SULOGINLIBS += $(LCRYPT) |
34 | endif | 36 | endif |