diff options
| author | Jiří Daněk <jdanek@redhat.com> | 2019-12-26 15:30:07 +0100 |
|---|---|---|
| committer | Abhishek Arya <inferno@chromium.org> | 2019-12-26 06:30:07 -0800 |
| commit | 58a0795ccc9d881d57fa205ba303898f2542716e (patch) | |
| tree | 3fee92b9a59ca8f76f84d93f110067af7e075a84 /projects | |
| parent | bbb5d37c071b18b3468598917a61a2c5cf8d0bc8 (diff) | |
| download | oss-fuzz-58a0795ccc9d881d57fa205ba303898f2542716e.tar.gz | |
[qpid-proton] Remove obsolete patch (#3163)
Patch was merged into upstream in https://github.com/apache/qpid-proton/pull/172
and https://github.com/apache/qpid-proton/pull/224
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/qpid-proton/Dockerfile | 1 | ||||
| -rwxr-xr-x | projects/qpid-proton/build.sh | 1 | ||||
| -rw-r--r-- | projects/qpid-proton/c_tests_fuzz_CMakeLists.patch | 35 |
3 files changed, 0 insertions, 37 deletions
diff --git a/projects/qpid-proton/Dockerfile b/projects/qpid-proton/Dockerfile index 492adf0e6..956a6592b 100644 --- a/projects/qpid-proton/Dockerfile +++ b/projects/qpid-proton/Dockerfile @@ -24,4 +24,3 @@ RUN git clone https://github.com/apache/qpid-proton.git WORKDIR qpid-proton COPY build.sh $SRC/ -COPY c_tests_fuzz_CMakeLists.patch $SRC/ diff --git a/projects/qpid-proton/build.sh b/projects/qpid-proton/build.sh index 62e51e4b6..610a6f539 100755 --- a/projects/qpid-proton/build.sh +++ b/projects/qpid-proton/build.sh @@ -15,7 +15,6 @@ # ################################################################################ -patch -p1 < $SRC/c_tests_fuzz_CMakeLists.patch || (cat c/tests/fuzz/CMakeLists.txt.rej && false) mkdir build pushd build cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC_LIBS=ON -DENABLE_FUZZ_TESTING=ON -DFUZZ_REGRESSION_TESTS=OFF diff --git a/projects/qpid-proton/c_tests_fuzz_CMakeLists.patch b/projects/qpid-proton/c_tests_fuzz_CMakeLists.patch deleted file mode 100644 index 06731753f..000000000 --- a/projects/qpid-proton/c_tests_fuzz_CMakeLists.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a0d2345bec4e7538ad7df535323a8acd8bec2d36 Mon Sep 17 00:00:00 2001 -From: Jiri Danek <jdanek@redhat.com> -Date: Thu, 13 Dec 2018 14:52:09 +0100 -Subject: [PATCH] NO-JIRA: c/test/fuzz patches from oss-fuzz - -* NO-JIRA: [c] prefer linking with static library in fuzz tests -* NO-JIRA: [c] link fuzzing binaries using CXX linker ---- - c/tests/fuzz/CMakeLists.txt | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/c/tests/fuzz/CMakeLists.txt b/c/tests/fuzz/CMakeLists.txt -index b4470d59..211252c4 100644 ---- a/c/tests/fuzz/CMakeLists.txt -+++ b/c/tests/fuzz/CMakeLists.txt -@@ -32,7 +32,16 @@ add_library (StandaloneFuzzTargetMain STATIC StandaloneFuzzTargetMain.c Standalo - - macro (pn_add_fuzz_test test) - add_executable (${test} ${ARGN}) -- target_link_libraries (${test} qpid-proton-core ${FUZZING_LIBRARY}) -+ # prefer static lib for the fuzzer, if available -+ if (BUILD_STATIC_LIBS) -+ set(FUZZING_QPID_PROTON_CORE_LIBRARY qpid-proton-core-static) -+ else() -+ set(FUZZING_QPID_PROTON_CORE_LIBRARY qpid-proton-core) -+ endif() -+ target_link_libraries (${test} ${FUZZING_QPID_PROTON_CORE_LIBRARY} ${FUZZING_LIBRARY}) -+ # -lFuzzingEngine is a C++ library, which needs c++ std lib -+ set_target_properties(${test} PROPERTIES LINKER_LANGUAGE CXX) -+ - list(APPEND fuzz_test_src ${ARGN}) - - if (FUZZ_REGRESSION_TESTS) --- -2.16.5 |