diff options
| author |   Ross Burton <ross.burton@intel.com> | 2019-03-26 12:02:50 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-26 14:03:48 +0000 |
| commit | b89a48da4bc25c769f8dbc15d5e8596258cda472 (patch) | |
| tree | 6d5bc3992f055bbf66a76816cff6f7eb2161f2fc /meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch | |
| parent | ea86bdb8935668d41e142676815af38911ee0faa (diff) | |
| download | openembedded-core-contrib-b89a48da4bc25c769f8dbc15d5e8596258cda472.tar.gz | |
sysvinit: consolidate patches
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch')
| -rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch new file mode 100644 index 0000000000..7b342901e1 --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit/crypt-lib.patch @@ -0,0 +1,25 @@ +Upstream-Status: Inappropriate [configuration] + +# 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) + |