Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / 
catch2


Commits:
b943d575 by Andreas Radke at 2023-12-05T07:39:17+01:00
upgpkg: 3.4.0-1; disable building of tests that now require full developement 
build; ship static default static library

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,14 +1,14 @@
 pkgbase = catch2
        pkgdesc = Modern, C++-native, header-only, test framework for 
unit-tests, TDD and BDD
-       pkgver = 2.13.10
+       pkgver = 3.4.0
        pkgrel = 1
        url = https://github.com/catchorg/catch2
-       arch = any
+       arch = x86_64
        license = Boost
        makedepends = git
        makedepends = cmake
        makedepends = python
-       source = 
catch2::git+https://github.com/catchorg/Catch2#commit=182c910b4b63ff587a3440e08f84f70497e49a81?signed
+       source = 
catch2::git+https://github.com/catchorg/Catch2#commit=6e79e682b726f524310d55dec8ddac4e9c52fb5f?signed
        validpgpkeys = E29C46F3B8A7502860793B7DECC9C20E314B2360
        validpgpkeys = 81E70B717FFB27AFDB45F52090BBFF120F9C087B
        sha512sums = SKIP


=====================================
PKGBUILD
=====================================
@@ -3,13 +3,14 @@
 # Contributor: Bart Verhagen <barrie.verhagen at gmail dot com>
 
 pkgname=catch2
-_gitcommit=182c910b4b63ff587a3440e08f84f70497e49a81
-pkgver=2.13.10
+_gitcommit=6e79e682b726f524310d55dec8ddac4e9c52fb5f
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="Modern, C++-native, header-only, test framework for unit-tests, TDD 
and BDD"
-arch=('any')
+arch=('x86_64')
 url="https://github.com/catchorg/catch2";
 license=('Boost')
+#depends=('gcc-libs' 'glibc') # only needed when building shared library
 makedepends=('git' 'cmake' 'python') # python seems to be necessary for 
building tests (FS#60273)
 
source=(${pkgname}::"git+https://github.com/catchorg/Catch2#commit=${_gitcommit}?signed";)
 sha512sums=('SKIP')
@@ -24,30 +25,35 @@ pkgver() {
 }
 
 build() {
-  cd ${pkgname}
-
-  # our recent default flags break test 14 (ApprovalTests)
-  unset CXXFLAGS
+  # our recent default flags break test 1 (ApprovalTests)
+#  unset CXXFLAGS
 
-  cmake -B build \
+  cmake -B "${pkgname}"/build \
+    -S "${pkgname}" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCATCH_USE_VALGRIND=OFF \
     -DCATCH_BUILD_EXAMPLES=OFF \
     -DCATCH_ENABLE_COVERAGE=OFF \
     -DCATCH_ENABLE_WERROR=OFF \
-    -DBUILD_TESTING=ON
-  make -C build
-}
+    -DBUILD_TESTING=OFF \
+    -DBUILD_SHARED_LIBS=OFF
 
-check() {
-  cd ${pkgname}
-  make -C build test
+#    -DBUILD_TESTING=ON \
+#    -DCATCH_BUILD_TESTING=ON \
+#    -DCATCH_DEVELOPMENT_BUILD=ON -Wno-dev \
+#    -DCATCH_BUILD_EXTRA_TESTS=ON 
+
+  cmake --build "${pkgname}"/build
 }
 
+#check() {
+#  # test are only built whith build option
+#  #  -DCATCH_DEVELOPMENT_BUILD=ON
+#  ctest --test-dir "${pkgname}"/build
+#}
+
 package() {
-  cd ${pkgname}
-  make -C build DESTDIR="$pkgdir" install
+  DESTDIR="${pkgdir}" cmake --install "${pkgname}"/build
 }
 
 # vim: ts=2 sw=2 et:



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/catch2/-/commit/b943d5758ed4b1e0674e3849cc9f9eea317233dc

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/catch2/-/commit/b943d5758ed4b1e0674e3849cc9f9eea317233dc
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to