blob: 6a3352548b263b45edb5d0f49b1acc5e85c33961 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From a85311965707ba2fa78f7ce044e6f61e65e66fd0 Mon Sep 17 00:00:00 2001
2From: Jim Somerville <Jim.Somerville@windriver.com>
3Date: Tue, 14 Oct 2014 02:56:08 -0400
Patrick Williamsb48b7b42016-08-17 15:04:38 -05004Subject: [PATCH] Skip AC_RUN_IFELSE tests
5
6Upstream-Status: Inappropriate [cross compiling specific]
7
8Such tests are not supported in a cross compile
9environment. Choose sane defaults.
10
11Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
12Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -040013
Patrick Williamsb48b7b42016-08-17 15:04:38 -050014---
Brad Bishop316dfdd2018-06-25 12:45:53 -040015 acinclude/krb5.m4 | 10 +++++++++-
16 acinclude/lib-checks.m4 | 8 ++++++--
Patrick Williamsb48b7b42016-08-17 15:04:38 -050017 2 files changed, 15 insertions(+), 3 deletions(-)
18
19diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
Brad Bishop316dfdd2018-06-25 12:45:53 -040020index 5c83d88..c264118 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050021--- a/acinclude/krb5.m4
22+++ b/acinclude/krb5.m4
Brad Bishop316dfdd2018-06-25 12:45:53 -040023@@ -61,7 +61,15 @@ main(void)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050024
25 return 0;
26 }
27-]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ])
28+]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ],
29+[
30+ dnl Can't test in cross compiled env - so assume good
31+ squid_cv_broken_heimdal_krb5_h=no
32+])
33+ ],
34+ [
35+ dnl Can't test in cross compiled env - so assume good
36+ squid_cv_broken_heimdal_krb5_h=no
37 ])
38 ])
39 ]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H
40diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4
Brad Bishop316dfdd2018-06-25 12:45:53 -040041index c4874da..ba72982 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050042--- a/acinclude/lib-checks.m4
43+++ b/acinclude/lib-checks.m4
Brad Bishop316dfdd2018-06-25 12:45:53 -040044@@ -177,7 +177,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
45 [
46 AC_MSG_RESULT([no])
Patrick Williamsb48b7b42016-08-17 15:04:38 -050047 ],
48- [])
49+ [
50+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
51+ ])
52
Brad Bishop316dfdd2018-06-25 12:45:53 -040053 SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
54 ]
55@@ -265,7 +267,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
56 AC_MSG_RESULT([yes])
57 AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050058 ],
59-[])
60+[
61+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
62+])
63
Brad Bishop316dfdd2018-06-25 12:45:53 -040064 SQUID_STATE_ROLLBACK(check_TXTDB)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050065 ])