mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
Armin Kuster
68c8fe1aba
ARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file configure.ac
Hunk #1 succeeded at 27 with fuzz 1 (offset 8 lines).
and others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
66 lines
1.8 KiB
Diff
66 lines
1.8 KiB
Diff
From a85311965707ba2fa78f7ce044e6f61e65e66fd0 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(-)
|
|
|
|
diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
|
|
index 5c83d88..c264118 100644
|
|
--- a/acinclude/krb5.m4
|
|
+++ b/acinclude/krb5.m4
|
|
@@ -61,7 +61,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
|
|
])
|
|
])
|
|
]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H
|
|
diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4
|
|
index c4874da..ba72982 100644
|
|
--- a/acinclude/lib-checks.m4
|
|
+++ b/acinclude/lib-checks.m4
|
|
@@ -177,7 +177,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
|
|
[
|
|
AC_MSG_RESULT([no])
|
|
],
|
|
- [])
|
|
+ [
|
|
+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
|
|
+ ])
|
|
|
|
SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
|
|
]
|
|
@@ -265,7 +267,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)
|
|
])
|