1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From 050f8ab275a7a5f3d94045da6b15a2b63dfbeb3f Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 14 Oct 2014 02:56:08 -0400
Subject: [PATCH] Skip AC_RUN_IFELSE tests
Upstream-Status: Inappropriate [cross compiling specific]
Such tests are not supported in a cross compile
environment. Choose sane defaults.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
acinclude/krb5.m4 | 10 +++++++++-
acinclude/lib-checks.m4 | 8 ++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
--- a/acinclude/krb5.m4
+++ b/acinclude/krb5.m4
@@ -57,7 +57,15 @@ main(void)
return 0;
}
-]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ])
+]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ],
+[
+ dnl Can't test in cross compiled env - so assume good
+ squid_cv_broken_heimdal_krb5_h=no
+])
+ ],
+ [
+ dnl Can't test in cross compiled env - so assume good
+ squid_cv_broken_heimdal_krb5_h=no
])
SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test)
])
--- a/acinclude/lib-checks.m4
+++ b/acinclude/lib-checks.m4
@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_
[
AC_MSG_RESULT([no])
],
- [])
+ [
+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
+ ])
SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
])
@@ -347,7 +349,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
],[
AC_MSG_RESULT([yes])
AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
- ],[])
+ ],[
+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
+ ])
SQUID_STATE_ROLLBACK(check_TXTDB)
])
|
