diff options
author | Armin Kuster <akuster808@gmail.com> | 2023-06-06 12:54:28 -0400 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-06-06 23:07:58 -0700 |
commit | 4bdd8014d59b7e443d08f82a10b736f052a4411b (patch) | |
tree | 4de09d31a4ae1143158e3b0c2496e36780ebe69e /meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch | |
parent | 0b06cbd97f3051ca0f8e4fcf189b1e644b85a94a (diff) | |
download | meta-openembedded-4bdd8014d59b7e443d08f82a10b736f052a4411b.tar.gz |
wireshark: Update to a supported version 4.0.x
Drop CVE patch as its included.
Drop 0003-bison-Remove-line-directives.patch as file is not longer there.
refactor 0001-wireshark-src-improve-reproducibility.patch
LIC_FILES_CHKSUM changed do to re-structuring.
Remove TMPDIR found in some files.
Remove c-ares PACKAGECONFIG as its a required pkg
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch')
-rw-r--r-- | meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch b/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch new file mode 100644 index 0000000000..0d51ce1b8f --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | From b4f29807225cf3744c2f4f971902fbdd7486fc19 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt> | ||
3 | Date: Fri, 26 May 2023 13:29:23 +0100 | ||
4 | Subject: [PATCH] CMake: Fix a try_run() test when cross-compiling | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
8 | |||
9 | --- | ||
10 | ConfigureChecks.cmake | 36 ++++++++++++++++++++---------------- | ||
11 | 1 file changed, 20 insertions(+), 16 deletions(-) | ||
12 | |||
13 | diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake | ||
14 | index dd8268e077..d8bca54115 100644 | ||
15 | --- a/ConfigureChecks.cmake | ||
16 | +++ b/ConfigureChecks.cmake | ||
17 | @@ -122,26 +122,30 @@ check_type_size("ssize_t" SSIZE_T) | ||
18 | # Check if the libc vsnprintf() conforms to C99. If this fails we may | ||
19 | # need to fall-back on GLib I/O. | ||
20 | # | ||
21 | -check_c_source_runs(" | ||
22 | - #include <stdio.h> | ||
23 | - int main(void) | ||
24 | - { | ||
25 | - /* Check that snprintf() and vsnprintf() don't return | ||
26 | - * -1 if the buffer is too small. C99 says this value | ||
27 | - * is the length that would be written not including | ||
28 | - * the nul byte. */ | ||
29 | - char buf[3]; | ||
30 | - return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; | ||
31 | - }" | ||
32 | - HAVE_C99_VSNPRINTF | ||
33 | -) | ||
34 | -if (NOT HAVE_C99_VSNPRINTF) | ||
35 | - message(FATAL_ERROR | ||
36 | +# If cross-compiling we can't check so just assume this requirement is met. | ||
37 | +# | ||
38 | +if(NOT CMAKE_CROSSCOMPILING) | ||
39 | + check_c_source_runs(" | ||
40 | + #include <stdio.h> | ||
41 | + int main(void) | ||
42 | + { | ||
43 | + /* Check that snprintf() and vsnprintf() don't return | ||
44 | + * -1 if the buffer is too small. C99 says this value | ||
45 | + * is the length that would be written not including | ||
46 | + * the nul byte. */ | ||
47 | + char buf[3]; | ||
48 | + return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; | ||
49 | + }" | ||
50 | + HAVE_C99_VSNPRINTF | ||
51 | + ) | ||
52 | + if (NOT HAVE_C99_VSNPRINTF) | ||
53 | + message(FATAL_ERROR | ||
54 | "Building Wireshark requires a C99 compliant vsnprintf() and this \ | ||
55 | target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \ | ||
56 | using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \ | ||
57 | developers at wireshark-dev@wireshark.org." | ||
58 | - ) | ||
59 | + ) | ||
60 | + endif() | ||
61 | endif() | ||
62 | |||
63 | # | ||
64 | -- | ||
65 | 2.25.1 | ||
66 | |||