a6fabd9610
Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.
Due to this change, asterisk fails to build with output:
Applying 0004-install-samples-need-the-data-files.patch using patch:
patching file Makefile
Hunk #1 FAILED at 779.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
This commit rebase the package patches on the current package version.
Note: the patch 0005 is unchanged, as it is correct in its current
state.
Fixes:
- http://autobuild.buildroot.org/results/92d/92d58ecb67f11a6eb74695bc1efcc672f69a57a9
Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From e959097b00357a2fd5f140daf3114c2245cd6b95 Mon Sep 17 00:00:00 2001
|
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
Date: Tue, 27 Dec 2016 11:21:57 +0100
|
|
Subject: [PATCH] configure: fix detection of libcrypt
|
|
|
|
The crypt() function is searched in two locations: -lcrypt and the
|
|
standard C library.
|
|
|
|
The result of the former is stored in the LIBCRYPT 'scheme' while that
|
|
of the latter is stored in the 'SYSCRYPT' scheme.
|
|
|
|
However, the check for mandatory modules looks at the CRYPT 'scheme',
|
|
and thus concludes that crypt is missing when it was successfully found.
|
|
|
|
Fix that by also storing the result of either check in the 'CRYPT'
|
|
scheme.
|
|
|
|
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
|
[Julien: rebase patch on tag 20.7.0]
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
---
|
|
configure.ac | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 639bcd9df3..16f4297634 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2694,10 +2694,12 @@ AC_CHECK_FUNC([crypt], [SYSCRYPT=true], [SYSCRYPT=""])
|
|
if test "x$LIBCRYPT_LIB" != "x" ; then
|
|
CRYPT_LIB="$LIBCRYPT_LIB"
|
|
CRYPT_INCLUDE="$LIBCRYPT_INCLUDE"
|
|
+ PBX_CRYPT=1
|
|
AC_DEFINE([HAVE_CRYPT], [1], [Define to 1 if you have the 'crypt' function.])
|
|
elif test "x$SYSCRYPT" != "x" ; then
|
|
CRYPT_LIB=""
|
|
CRYPT_INCLUDE=""
|
|
+ PBX_CRYPT=1
|
|
AC_DEFINE([HAVE_CRYPT], [1], [Define to 1 if you have the 'crypt' function.])
|
|
fi
|
|
|
|
--
|
|
2.45.2
|
|
|