blob: e0d002c68cf92381ed947481a73917f1df032580 [file] [log] [blame]
Patrick Williamsda295312023-12-05 16:48:56 -06001From 050f8ab275a7a5f3d94045da6b15a2b63dfbeb3f Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: 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
Patrick Williamsb48b7b42016-08-17 15:04:38 -050019--- a/acinclude/krb5.m4
20+++ b/acinclude/krb5.m4
Patrick Williamsda295312023-12-05 16:48:56 -060021@@ -57,7 +57,15 @@ main(void)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050022
23 return 0;
24 }
25-]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ])
26+]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ],
27+[
28+ dnl Can't test in cross compiled env - so assume good
29+ squid_cv_broken_heimdal_krb5_h=no
30+])
31+ ],
32+ [
33+ dnl Can't test in cross compiled env - so assume good
34+ squid_cv_broken_heimdal_krb5_h=no
35 ])
Patrick Williamsda295312023-12-05 16:48:56 -060036 SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050037 ])
Patrick Williamsb48b7b42016-08-17 15:04:38 -050038--- a/acinclude/lib-checks.m4
39+++ b/acinclude/lib-checks.m4
Patrick Williams03514f12024-04-05 07:04:11 -050040@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_
Brad Bishop316dfdd2018-06-25 12:45:53 -040041 [
42 AC_MSG_RESULT([no])
Patrick Williamsb48b7b42016-08-17 15:04:38 -050043 ],
44- [])
45+ [
46+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
47+ ])
48
Brad Bishop316dfdd2018-06-25 12:45:53 -040049 SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
Brad Bishopc342db32019-05-15 21:57:59 -040050 ])
Patrick Williamsda295312023-12-05 16:48:56 -060051@@ -347,7 +349,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
52 ],[
53 AC_MSG_RESULT([yes])
54 AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
55- ],[])
Andrew Geissler87f5cff2022-09-30 13:13:31 -050056+ ],[
57+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
58+ ])
Patrick Williamsb48b7b42016-08-17 15:04:38 -050059
Patrick Williamsda295312023-12-05 16:48:56 -060060 SQUID_STATE_ROLLBACK(check_TXTDB)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050061 ])