blob: 10853333e227c7114a3aac748f3468c1d1e53568 [file] [log] [blame]
Brad Bishopc342db32019-05-15 21:57:59 -04001From e4778299a3e49a634d2c7fe4fd9ac77777e829e3 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
19diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
Brad Bishopc342db32019-05-15 21:57:59 -040020index ad0ba60..4477446 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
Andrew Geissler87f5cff2022-09-30 13:13:31 -050041index 1e9333527c..2d42787029 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050042--- a/acinclude/lib-checks.m4
43+++ b/acinclude/lib-checks.m4
Andrew Geissler87f5cff2022-09-30 13:13:31 -050044@@ -227,7 +227,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
Brad Bishop316dfdd2018-06-25 12:45:53 -040045 [
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)
Brad Bishopc342db32019-05-15 21:57:59 -040054 ])
Andrew Geissler87f5cff2022-09-30 13:13:31 -050055@@ -386,8 +386,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
56 [
Brad Bishop316dfdd2018-06-25 12:45:53 -040057 AC_MSG_RESULT([yes])
58 AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
Andrew Geissler87f5cff2022-09-30 13:13:31 -050059- ],
Patrick Williamsb48b7b42016-08-17 15:04:38 -050060-[])
Andrew Geissler87f5cff2022-09-30 13:13:31 -050061+ ],[
62+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
63+ ])
Patrick Williamsb48b7b42016-08-17 15:04:38 -050064
Brad Bishop316dfdd2018-06-25 12:45:53 -040065 SQUID_STATE_ROLLBACK(check_TXTDB)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050066 ])