summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-08-22 08:28:02 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-08-24 15:05:20 +0200
commitd3de556d28b0e92541ade939a58706bc94ed8ab4 (patch)
treea437e4d80bba0115d2c3610080eb5c512c71e66c
parent8305f6ffbc391b25a24b25257089c1e0c99bd9aa (diff)
sysvinit: make sure to link against libcrypt
sysvinit Makefile checks if /usr/lib/libcrypt.a exists to determine whether it should link against libcrypt or not. This test fails on distributions such as Fedora, in which /usr/lib/libcrypt.a does not exist (it is in /usr/lib64), but where libcrypt is available on the target. As libcrypt is available in both uClibc and gclibc, we just force sysvinit to link against libcrypt. Fixes bug #2401. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/sysvinit/sysvinit.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 0b827e615..09aaf741f 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -21,7 +21,9 @@ $(SYSVINIT_DIR)/.unpacked: $(DL_DIR)/$(SYSVINIT_SOURCE)
touch $@
$(SYSVINIT_DIR)/$(SYSVINIT_BINARY): $(SYSVINIT_DIR)/.unpacked
- CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC="$(TARGET_CC)" -C $(SYSVINIT_DIR)/src
+ # Force sysvinit to link against libcrypt as it otherwise
+ # use an incorrect test to see if it's available
+ CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC="$(TARGET_CC)" LCRYPT="-lcrypt" -C $(SYSVINIT_DIR)/src
$(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY): $(SYSVINIT_DIR)/$(SYSVINIT_BINARY)
for x in halt init shutdown; do \