summaryrefslogtreecommitdiffstats
path: root/cppunit/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'cppunit/makefile.mk')
-rw-r--r--cppunit/makefile.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 0be4d457b46a..30734ce68899 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download>
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch cppunit-1.12.1-warnings.patch
# solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912590&group_id=11795&atid=311795>; upstreamed as
# <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=
@@ -55,6 +55,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
# SAL_UNUSED_PARAMETER in sal/types.h); upstreamed as
# <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=
# 7a09bf3a88e99d85c4dec2ad296309dbec2987c3>
+ # cppunit-1.12.1-warnings.patch: work around additional warnings (found when
+ # converting module unotest to gbuild)
.IF "$(OS)" == "ANDROID"
PATCH_FILES += android.patch