cppunit: add static/shared variant, add version 1.15_20220904 (#33522)

This commit is contained in:
iarspider 2022-10-27 02:04:29 +02:00 committed by GitHub
parent 8fc3e49e00
commit 9d7c688d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/include/cppunit/extensions/TestSuiteBuilderContext.h b/include/cppunit/extensions/TestSuiteBuilderContext.h
index 12d157e..ad1a34f 100644
--- a/include/cppunit/extensions/TestSuiteBuilderContext.h
+++ b/include/cppunit/extensions/TestSuiteBuilderContext.h
@@ -42,8 +42,6 @@ public:
TestSuiteBuilderContextBase(TestSuiteBuilderContextBase const &) = default;
TestSuiteBuilderContextBase(TestSuiteBuilderContextBase &&) = default;
- TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase const &) = default;
- TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase &&) = default;
/*! \brief Adds a test to the fixture suite.
*

View File

@ -11,10 +11,20 @@ class Cppunit(AutotoolsPackage):
homepage = "https://wiki.freedesktop.org/www/Software/cppunit/"
url = "https://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"
git = "https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
version("1.14.0", sha256="3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780")
version("master", branch="master")
version("1.15_20220904", commit="78e64f0edb4f3271a6ddbcdf9cba05138597bfca")
version(
"1.14.0",
sha256="3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780",
preferred=True,
)
version("1.13.2", sha256="3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f")
# https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_12_6_X/master/cppunit-1.14-defaulted-function-deleted.patch
patch("cppunit-1.14-defaulted-function-deleted.patch", when="@1.15:")
variant(
"cxxstd",
default="default",
@ -23,6 +33,18 @@ class Cppunit(AutotoolsPackage):
description="Use the specified C++ standard when building.",
)
variant(
"libs",
default="shared,static",
values=("shared", "static"),
multi=True,
description="Build shared libs, static libs or both",
)
depends_on("autoconf", type="build", when="@1.15_20220904")
depends_on("automake", type="build", when="@1.15_20220904")
depends_on("libtool", type="build", when="@1.15_20220904")
def setup_build_environment(self, env):
cxxstd = self.spec.variants["cxxstd"].value
cxxstdflag = (
@ -32,4 +54,6 @@ def setup_build_environment(self, env):
def configure_args(self):
args = ["--disable-doxygen"]
args += self.enable_or_disable("libs")
return args