sysvinit - Remove sulogin dependency on /usr/lib*/libcrypt.a

The sulogin compile checked for /usr/lib*/libcrypt.a to decide whether
to add -lcrypt to the final compile.  However, the recipe puts LCRYPT
in the environment, so crypt-lib.patch makes the Makefile check for
this before looking at the host /usr/lib.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
This commit is contained in:
Jeff Dike 2010-07-14 14:35:52 -04:00 committed by Richard Purdie
parent fd1d661b39
commit 2295705918
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,23 @@
# 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
Index: sysvinit-2.88dsf/src/Makefile
===================================================================
--- sysvinit-2.88dsf.orig/src/Makefile
+++ sysvinit-2.88dsf/src/Makefile
@@ -85,9 +85,13 @@ else
endif
# Additional libs for GNU libc.
+ifneq ($(LCRYPT),)
+ SULOGINLIBS += $(LCRYPT)
+else
ifneq ($(wildcard /usr/lib*/libcrypt.a),)
SULOGINLIBS += -lcrypt
endif
+endif
all: $(BIN) $(SBIN) $(USRBIN)

View File

@ -4,7 +4,7 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
PR = "r0"
PR = "r1"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
@ -22,6 +22,7 @@ SYSVINIT_ENABLED_GETTYS ?= "1"
SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \
file://install.patch \
file://crypt-lib.patch \
file://need \
file://provide \
file://inittab \