Skip to content

Commit 028083b

Browse files
authored
wireshark: Update a few CMake variables (#14217)
Update a few CMake variables that have changed in recent Wireshark releases. Logray changed names to Stratoshark. Stratoshark isn't built by default yet, so that has been having no effect, but make sure that the GUI application is explicitly disabled in case the defaults change later. ENABLE_STATIC=ON was replaced by BUILD_SHARED_LIBS=OFF. DISABLE_WERROR was replaced by ENABLE_WERROR (with opposite valence). Signed-off-by: John Thacker <johnthacker@gmail.com>
1 parent dece6f0 commit 028083b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

projects/wireshark/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,23 @@ CMAKE_DEFINES="-DBUILD_fuzzshark=ON"
4141
# compile static version of libs
4242
# XXX, with static wireshark linking each fuzzer binary is ~346 MB (just libwireshark.a is 761 MB).
4343
# XXX, wireshark is not ready for including static plugins into binaries.
44-
CMAKE_DEFINES="$CMAKE_DEFINES -DENABLE_STATIC=ON -DENABLE_PLUGINS=OFF"
44+
CMAKE_DEFINES="$CMAKE_DEFINES -DBUILD_SHARED_LIBS=OFF -DENABLE_PLUGINS=OFF"
4545

4646
# disable optional dependencies
4747
CMAKE_DEFINES="$CMAKE_DEFINES -DENABLE_PCAP=OFF -DENABLE_GNUTLS=OFF"
4848

4949
# There is no need to manually disable programs via BUILD_xxx=OFF since the
5050
# all-fuzzers targets builds the minimum required binaries. However we do have
5151
# to disable the Qt GUI and sharkd or else the cmake step will fail.
52-
CMAKE_DEFINES="$CMAKE_DEFINES -DBUILD_wireshark=OFF -DBUILD_logray=OFF -DBUILD_sharkd=OFF"
52+
CMAKE_DEFINES="$CMAKE_DEFINES -DBUILD_wireshark=OFF -DBUILD_stratoshark=OFF -DBUILD_sharkd=OFF"
5353

5454
cd "$WIRESHARK_BUILD_PATH"
5555

5656
cmake -GNinja \
5757
-DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
5858
-DCMAKE_C_FLAGS="-Wno-error=fortify-source -Wno-error=missing-field-initializers $CFLAGS" -DCMAKE_CXX_FLAGS="-Wno-error=fortify-source -Wno-error=missing-field-initializers $CXXFLAGS" \
59-
-DDISABLE_WERROR=ON -DOSS_FUZZ=ON $CMAKE_DEFINES \
60-
-DUSE_STATIC=ON -DBUILD_SHARED_LIBS=OFF $SRC/wireshark
59+
-DENABLE_WERROR=OFF -DOSS_FUZZ=ON $CMAKE_DEFINES \
60+
-DUSE_STATIC=ON $SRC/wireshark
6161

6262
ninja all-fuzzers -j$(expr $(nproc) / 2)
6363

0 commit comments

Comments
 (0)