summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-05 13:33:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-12-05 21:24:24 +0100
commitde5eec5e2ab8186cfb49b2341e2f6f850a95d77f (patch)
tree2437686aa5e4233708a51b3206bffdbd42917d88
parent4ee1b8f144b90e3532adfac7e5e806552612472e (diff)
drop opencl and clew for fuzzing
Change-Id: I6b438e32b1be1ee8fbd72d296e3824b8bb473e8e Reviewed-on: https://gerrit.libreoffice.org/45878 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--configure.ac4
-rw-r--r--vcl/commonfuzzer.mk2
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 2e3785e30b8a..ace6b04ae26e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10046,7 +10046,7 @@ AC_SUBST(ENABLE_VLC)
ENABLE_OPENGL_TRANSITIONS=
ENABLE_OPENGL_CANVAS=
-if test $_os = iOS -o $_os = Android; then
+if test $_os = iOS -o $_os = Android -o "$ENABLE_FUZZERS" = "TRUE"; then
: # disable
elif test "$_os" = "Darwin"; then
# We use frameworks on Mac OS X, no need for detail checks
@@ -10073,7 +10073,7 @@ dnl =================================================
dnl Check whether to build with OpenCL support.
dnl =================================================
-if test $_os != iOS -a $_os != Android; then
+if test $_os != iOS -a $_os != Android -a "$ENABLE_FUZZERS" != "TRUE"; then
# OPENCL in BUILD_TYPE and HAVE_FEATURE_OPENCL tell that OpenCL is potentially available on the
# platform (optional at run-time, used through clew).
BUILD_TYPE="$BUILD_TYPE OPENCL"
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index e91fa353d1e5..06aa0be9a4eb 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -32,7 +32,6 @@ fuzzer_externals = \
libxml2 \
libjpeg \
libpng \
- clew \
openssl \
expat \
mythes \
@@ -90,7 +89,6 @@ fuzzer_core_libraries = \
utl \
uui \
vcl \
- opencl \
xmlscript \
xo \
xstor \