diff options
| author | iarspider <iarspider@gmail.com> | 2022-10-27 02:04:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-26 17:04:29 -0700 |
| commit | 9d7c688d3c83dd6d20d2366d82e8a466c576d99a (patch) | |
| tree | 3a3db4a531c08560a4e9a394c7e74685e092f4e6 /var | |
| parent | 8fc3e49e00b0b3ecfeddce5a986edd77c5571642 (diff) | |
| download | spack-9d7c688d3c83dd6d20d2366d82e8a466c576d99a.tar.gz spack-9d7c688d3c83dd6d20d2366d82e8a466c576d99a.tar.bz2 spack-9d7c688d3c83dd6d20d2366d82e8a466c576d99a.tar.xz spack-9d7c688d3c83dd6d20d2366d82e8a466c576d99a.zip | |
cppunit: add static/shared variant, add version 1.15_20220904 (#33522)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cppunit/cppunit-1.14-defaulted-function-deleted.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cppunit/package.py | 28 |
2 files changed, 39 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/cppunit/cppunit-1.14-defaulted-function-deleted.patch b/var/spack/repos/builtin/packages/cppunit/cppunit-1.14-defaulted-function-deleted.patch new file mode 100644 index 0000000000..59c2d5d114 --- /dev/null +++ b/var/spack/repos/builtin/packages/cppunit/cppunit-1.14-defaulted-function-deleted.patch @@ -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. + * diff --git a/var/spack/repos/builtin/packages/cppunit/package.py b/var/spack/repos/builtin/packages/cppunit/package.py index be3515ab31..2db7440cb0 100644 --- a/var/spack/repos/builtin/packages/cppunit/package.py +++ b/var/spack/repos/builtin/packages/cppunit/package.py @@ -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" - - version("1.14.0", sha256="3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780") + git = "https://anongit.freedesktop.org/git/libreoffice/cppunit.git" + + 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 @@ class Cppunit(AutotoolsPackage): def configure_args(self): args = ["--disable-doxygen"] + args += self.enable_or_disable("libs") + return args |