From 63661d3a7f670c6ef8da0316eefbf362e96945f8 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 20 Apr 2022 16:39:49 +0100 Subject: [PATCH] cppunit-optional Gbp-Pq: Name cppunit-optional.diff --- Repository.mk | 4 ++++ config_host.mk.in | 1 + configure.ac | Bin 527275 -> 527536 bytes sal/Module_sal.mk | 7 ++++++- sdext/Executable_pdf2xml.mk | 12 ++++++++++-- smoketest/Module_smoketest.mk | 6 ++++++ test/Module_test.mk | 2 ++ testtools/Module_testtools.mk | 4 ++++ unotest/Module_unotest.mk | 2 ++ 9 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Repository.mk b/Repository.mk index 009c3bdff2d..a59497936bd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -803,8 +803,12 @@ endif # 'test_unittest' is only package delivering to workdir. # Other packages could be potentially autoinstalled. +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Helper_register_packages, \ test_unittest \ +)) +endif +$(eval $(call gb_Helper_register_packages, \ cli_basetypes_copy \ extras_wordbook \ instsetoo_native_setup \ diff --git a/config_host.mk.in b/config_host.mk.in index 54798e0836a..8226e423069 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -151,6 +151,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@ export SYSTEM_COINMP=@SYSTEM_COINMP@ export COINMP_CFLAGS=@COINMP_CFLAGS@ export COINMP_LIBS=@COINMP_LIBS@ +export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@ export ENABLE_CUPS=@ENABLE_CUPS@ export ENABLE_CURL=@ENABLE_CURL@ export ENABLE_FUZZERS=@ENABLE_FUZZERS@ diff --git a/configure.ac b/configure.ac index 05c7cdffbc2971004f79426749d69a9f0d498b6f..e7ddacd1a518e79bc8cadc9cb4df6022c33d4501 100644 GIT binary patch delta 255 zcmZ2IU17sag@!GRz6s391qIXn5*QVx8^|%Tqyc%Qd6^}4u{vA|P!OGxS)7=Zld6zZ znwgW5nU}7isHu>jrT|r{P+U@)mZp%HQ=AW0QKFDiS_D+3keiqd)f20!!=+Q6S&|VC z)ie3SGtub_k{MaseG?dgm^1tWwiY z@Uv=2fZXQl=ji0)8t)ts5bEa{VjB_^>dH0!{B$M>cBs&FLw>f<=??j99PNGrtU%1R K-A{l$_BQ}=k5xPX delta 63 zcmdlmQ(^UVg@!GRz6tGL5*UG)35c1ue@S48Uq3zS3bV}g=>n`8(~aGk!=@it$;{Cn QEXWGPY}