summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorJeff Dike <jdike@x86_64.user-mode-linux.org>2010-07-14 14:35:52 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-15 13:44:56 +0100
commit2295705918707992705b5df4e4c17cb4cf5a3df5 (patch)
tree89125544b51a530fd42429cb96ca1799df80de67 /meta/packages
parentfd1d661b391dfad1edaac937a17c1165f635031a (diff)
downloadpoky-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>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/sysvinit/sysvinit-2.88dsf/crypt-lib.patch23
-rw-r--r--meta/packages/sysvinit/sysvinit_2.88dsf.bb3
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 @@
1# The src Makefile was checking for libcrypt.a on the host, not in the
2# build environment. This patch checks for $LCRYPT in the environment
3# and uses it if it's there.
4# - jdike@linux.intel.com
5
6Index: sysvinit-2.88dsf/src/Makefile
7===================================================================
8--- sysvinit-2.88dsf.orig/src/Makefile
9+++ sysvinit-2.88dsf/src/Makefile
10@@ -85,9 +85,13 @@ else
11 endif
12
13 # Additional libs for GNU libc.
14+ifneq ($(LCRYPT),)
15+ SULOGINLIBS += $(LCRYPT)
16+else
17 ifneq ($(wildcard /usr/lib*/libcrypt.a),)
18 SULOGINLIBS += -lcrypt
19 endif
20+endif
21
22 all: $(BIN) $(SBIN) $(USRBIN)
23
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"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
6 file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4" 6 file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
7PR = "r0" 7PR = "r1"
8 8
9# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. 9# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
10# Set PACKAGE_ARCH appropriately. 10# Set PACKAGE_ARCH appropriately.
@@ -22,6 +22,7 @@ SYSVINIT_ENABLED_GETTYS ?= "1"
22 22
23SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \ 23SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \
24 file://install.patch \ 24 file://install.patch \
25 file://crypt-lib.patch \
25 file://need \ 26 file://need \
26 file://provide \ 27 file://provide \
27 file://inittab \ 28 file://inittab \