Initial commit
This commit is contained in:
Your Name
+66
@@ -0,0 +1,66 @@
|
||||
From b4f29807225cf3744c2f4f971902fbdd7486fc19 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt>
|
||||
Date: Fri, 26 May 2023 13:29:23 +0100
|
||||
Subject: [PATCH] CMake: Fix a try_run() test when cross-compiling
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||
|
||||
---
|
||||
ConfigureChecks.cmake | 36 ++++++++++++++++++++----------------
|
||||
1 file changed, 20 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
|
||||
index dd8268e077..d8bca54115 100644
|
||||
--- a/ConfigureChecks.cmake
|
||||
+++ b/ConfigureChecks.cmake
|
||||
@@ -122,26 +122,30 @@ check_type_size("ssize_t" SSIZE_T)
|
||||
# Check if the libc vsnprintf() conforms to C99. If this fails we may
|
||||
# need to fall-back on GLib I/O.
|
||||
#
|
||||
-check_c_source_runs("
|
||||
- #include <stdio.h>
|
||||
- int main(void)
|
||||
- {
|
||||
- /* Check that snprintf() and vsnprintf() don't return
|
||||
- * -1 if the buffer is too small. C99 says this value
|
||||
- * is the length that would be written not including
|
||||
- * the nul byte. */
|
||||
- char buf[3];
|
||||
- return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
|
||||
- }"
|
||||
- HAVE_C99_VSNPRINTF
|
||||
-)
|
||||
-if (NOT HAVE_C99_VSNPRINTF)
|
||||
- message(FATAL_ERROR
|
||||
+# If cross-compiling we can't check so just assume this requirement is met.
|
||||
+#
|
||||
+if(NOT CMAKE_CROSSCOMPILING)
|
||||
+ check_c_source_runs("
|
||||
+ #include <stdio.h>
|
||||
+ int main(void)
|
||||
+ {
|
||||
+ /* Check that snprintf() and vsnprintf() don't return
|
||||
+ * -1 if the buffer is too small. C99 says this value
|
||||
+ * is the length that would be written not including
|
||||
+ * the nul byte. */
|
||||
+ char buf[3];
|
||||
+ return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
|
||||
+ }"
|
||||
+ HAVE_C99_VSNPRINTF
|
||||
+ )
|
||||
+ if (NOT HAVE_C99_VSNPRINTF)
|
||||
+ message(FATAL_ERROR
|
||||
"Building Wireshark requires a C99 compliant vsnprintf() and this \
|
||||
target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \
|
||||
using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \
|
||||
developers at wireshark-dev@wireshark.org."
|
||||
- )
|
||||
+ )
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
#
|
||||
--
|
||||
2.25.1
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
From 0a9ab056ce7582033a21d6bc541ece520bf2b0b6 Mon Sep 17 00:00:00 2001
|
||||
From: Oleksiy Obitotskyy <oobitots@cisco.com>
|
||||
Date: Thu, 26 Nov 2020 05:38:31 -0800
|
||||
Subject: [PATCH] wireshark-src: improve reproducibility
|
||||
|
||||
Cut absolute path for filename in generated code
|
||||
comments.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
|
||||
---
|
||||
tools/make-plugin-reg.py | 2 +-
|
||||
tools/ncp2222.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: wireshark-4.0.6/tools/ncp2222.py
|
||||
===================================================================
|
||||
--- wireshark-4.0.6.orig/tools/ncp2222.py
|
||||
+++ wireshark-4.0.6/tools/ncp2222.py
|
||||
@@ -5891,7 +5891,7 @@ def produce_code():
|
||||
|
||||
print("/*")
|
||||
print(" * Do not modify this file. Changes will be overwritten.")
|
||||
- print(" * Generated automatically from %s" % (sys.argv[0]))
|
||||
+ print(" * Generated automatically from %s" % (os.path.basename(sys.argv[0])))
|
||||
print(" */\n")
|
||||
|
||||
print("""
|
||||
+46
@@ -0,0 +1,46 @@
|
||||
From 3e571e24c730f747d18ed02ba7451e9e00480fc7 Mon Sep 17 00:00:00 2001
|
||||
From: Oleksiy Obitotskyy <oobitots@cisco.com>
|
||||
Date: Thu, 26 Nov 2020 12:00:43 -0800
|
||||
Subject: [PATCH] flex: Remove #line directives
|
||||
|
||||
Append --noline option to flex to not
|
||||
generate #line directives with absolute file patch.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
|
||||
---
|
||||
cmake/modules/FindLEX.cmake | 18 +++++++++++++-----
|
||||
1 file changed, 13 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake
|
||||
index 0008bc4..ec68f84 100644
|
||||
--- a/cmake/modules/FindLEX.cmake
|
||||
+++ b/cmake/modules/FindLEX.cmake
|
||||
@@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated)
|
||||
SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c)
|
||||
SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_lex.h)
|
||||
|
||||
- ADD_CUSTOM_COMMAND(
|
||||
- OUTPUT ${_outc} ${_outh}
|
||||
- COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in}
|
||||
- DEPENDS ${_in}
|
||||
- )
|
||||
+ IF (DEFINED ENV{SOURCE_DATE_EPOCH})
|
||||
+ ADD_CUSTOM_COMMAND(
|
||||
+ OUTPUT ${_outc} ${_outh}
|
||||
+ COMMAND ${LEX_EXECUTABLE} --noline -o${_outc} --header-file=${_outh} ${_in}
|
||||
+ DEPENDS ${_in}
|
||||
+ )
|
||||
+ ELSE ()
|
||||
+ ADD_CUSTOM_COMMAND(
|
||||
+ OUTPUT ${_outc} ${_outh}
|
||||
+ COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in}
|
||||
+ DEPENDS ${_in}
|
||||
+ )
|
||||
+ ENDIF ()
|
||||
LIST(APPEND ${_source} ${_in})
|
||||
LIST(APPEND ${_generated} ${_outc})
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
--
|
||||
2.26.2.Cisco
|
||||
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
From 17f05a8d02c589e4867906f70381e63e46a67870 Mon Sep 17 00:00:00 2001
|
||||
From: Oleksiy Obitotskyy <oobitots@cisco.com>
|
||||
Date: Wed, 27 Jan 2021 06:47:13 -0800
|
||||
Subject: [PATCH] lemon: Remove #line directives
|
||||
|
||||
In case of reproducible build remove #line
|
||||
directives with extra option '-l'.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
|
||||
---
|
||||
cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++-----------
|
||||
1 file changed, 34 insertions(+), 15 deletions(-)
|
||||
|
||||
Index: wireshark-3.4.11/cmake/modules/UseLemon.cmake
|
||||
===================================================================
|
||||
--- wireshark-3.4.11.orig/cmake/modules/UseLemon.cmake
|
||||
+++ wireshark-3.4.11/cmake/modules/UseLemon.cmake
|
||||
@@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated
|
||||
|
||||
SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename})
|
||||
|
||||
- ADD_CUSTOM_COMMAND(
|
||||
- OUTPUT
|
||||
- ${_out}.c
|
||||
- # These files are generated as side-effect
|
||||
- ${_out}.h
|
||||
- ${_out}.out
|
||||
- COMMAND $<TARGET_FILE:lemon>
|
||||
- -T${_lemonpardir}/lempar.c
|
||||
- -d.
|
||||
- ${_in}
|
||||
- DEPENDS
|
||||
- ${_in}
|
||||
- lemon
|
||||
- ${_lemonpardir}/lempar.c
|
||||
- )
|
||||
+ IF (DEFINED ENV{SOURCE_DATE_EPOCH})
|
||||
+ ADD_CUSTOM_COMMAND(
|
||||
+ OUTPUT
|
||||
+ ${_out}.c
|
||||
+ # These files are generated as side-effect
|
||||
+ ${_out}.h
|
||||
+ ${_out}.out
|
||||
+ COMMAND lemon
|
||||
+ -l
|
||||
+ -T${_lemonpardir}/lempar.c
|
||||
+ -d.
|
||||
+ ${_in}
|
||||
+ DEPENDS
|
||||
+ ${_in}
|
||||
+ lemon
|
||||
+ ${_lemonpardir}/lempar.c
|
||||
+ )
|
||||
+ ELSE ()
|
||||
+ ADD_CUSTOM_COMMAND(
|
||||
+ OUTPUT
|
||||
+ ${_out}.c
|
||||
+ # These files are generated as side-effect
|
||||
+ ${_out}.h
|
||||
+ ${_out}.out
|
||||
+ COMMAND lemon
|
||||
+ -T${_lemonpardir}/lempar.c
|
||||
+ -d.
|
||||
+ ${_in}
|
||||
+ DEPENDS
|
||||
+ ${_in}
|
||||
+ lemon
|
||||
+ ${_lemonpardir}/lempar.c
|
||||
+ )
|
||||
+ ENDIF ()
|
||||
|
||||
LIST(APPEND ${_source} ${_in})
|
||||
LIST(APPEND ${_generated} ${_out}.c)
|
||||
Reference in New Issue
Block a user