diff options
Diffstat (limited to 'meta/recipes-extended/pam/libpam/crypt_configure.patch')
-rw-r--r-- | meta/recipes-extended/pam/libpam/crypt_configure.patch | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/meta/recipes-extended/pam/libpam/crypt_configure.patch b/meta/recipes-extended/pam/libpam/crypt_configure.patch index bec82a5f10..917a8af64d 100644 --- a/meta/recipes-extended/pam/libpam/crypt_configure.patch +++ b/meta/recipes-extended/pam/libpam/crypt_configure.patch | |||
@@ -1,31 +1,40 @@ | |||
1 | From b86575ab4a0df07da160283459da270e1c0372a0 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Tue, 24 May 2016 14:11:09 +0300 | ||
4 | Subject: [PATCH] crypt_configure | ||
5 | |||
1 | This patch fixes a case where it find crypt defined in libc (musl) but | 6 | This patch fixes a case where it find crypt defined in libc (musl) but |
2 | not in specified libraries then it ends up assigning | 7 | not in specified libraries then it ends up assigning |
3 | |||
4 | LIBCRYPT="-l" which then goes into makefile cause all sort of problems | 8 | LIBCRYPT="-l" which then goes into makefile cause all sort of problems |
5 | e.g. | 9 | e.g. |
6 | 10 | ||
7 | ld: cannot find -l-m32 | 11 | ld: cannot find -l-m32 |
8 | | collect2: error: ld returned 1 exit status | 12 | | collect2: error: ld returned 1 exit status |
9 | 13 | The reason is that -l appears on commandline with | |
10 | The reason is that -l appears on commandline with out any library and | 14 | out any library and compiler treats the next argument as library name |
11 | compiler treats the next argument as library name whatever it is. | 15 | whatever it is. |
12 | |||
13 | 16 | ||
14 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
18 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
20 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
21 | --- | ||
22 | configure.ac | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | 24 | ||
17 | Index: Linux-PAM-1.1.6/configure.in | 25 | diff --git a/configure.ac b/configure.ac |
18 | =================================================================== | 26 | index df39d07..e68d856 100644 |
19 | --- Linux-PAM-1.1.6.org/configure.ac | 27 | --- a/configure.ac |
20 | +++ Linux-PAM-1.1.6/configure.ac | 28 | +++ b/configure.ac |
21 | @@ -400,7 +400,9 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = | 29 | @@ -401,7 +401,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], |
22 | [crypt_libs="crypt"]) | 30 | [crypt_libs="crypt"]) |
23 | 31 | ||
24 | BACKUP_LIBS=$LIBS | 32 | BACKUP_LIBS=$LIBS |
25 | -AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="") | 33 | -AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_lib:+-l$ac_lib}", LIBCRYPT="") |
26 | +AC_SEARCH_LIBS([crypt],[$crypt_libs], | 34 | +AC_SEARCH_LIBS([crypt],[$crypt_libs], [test "$ac_cv_search_crypt" = "none required" || LIBCRYPT="$ac_cv_search_crypt"]) |
27 | + [test "$ac_cv_search_crypt" = "none required" || | ||
28 | + LIBCRYPT="$ac_cv_search_crypt"]) | ||
29 | AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) | 35 | AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) |
30 | LIBS=$BACKUP_LIBS | 36 | LIBS=$BACKUP_LIBS |
31 | AC_SUBST(LIBCRYPT) | 37 | AC_SUBST(LIBCRYPT) |
38 | -- | ||
39 | 2.4.0 | ||
40 | |||