diff options
| author |   Jeff Dike <jdike@x86_64.user-mode-linux.org> | 2010-07-14 14:35:52 -0400 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-07-15 13:44:56 +0100 |
| commit | 2295705918707992705b5df4e4c17cb4cf5a3df5 (patch) | |
| tree | 89125544b51a530fd42429cb96ca1799df80de67 | |
| parent | fd1d661b391dfad1edaac937a17c1165f635031a (diff) | |
| download | openembedded-core-contrib-2295705918707992705b5df4e4c17cb4cf5a3df5.tar.gz | |
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>
| -rw-r--r-- | meta/packages/sysvinit/sysvinit-2.88dsf/crypt-lib.patch | 23 | ||||
| -rw-r--r-- | meta/packages/sysvinit/sysvinit_2.88dsf.bb | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/packages/sysvinit/sysvinit-2.88dsf/crypt-lib.patch b/meta/packages/sysvinit/sysvinit-2.88dsf/crypt-lib.patch new file mode 100644 index 0000000000..b9511f088e --- /dev/null +++ b/meta/packages/sysvinit/sysvinit-2.88dsf/crypt-lib.patch @@ -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) + diff --git a/meta/packages/sysvinit/sysvinit_2.88dsf.bb b/meta/packages/sysvinit/sysvinit_2.88dsf.bb index d7821459de..db38064548 100644 --- a/meta/packages/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/packages/sysvinit/sysvinit_2.88dsf.bb @@ -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 \ |