Carl Smedstad pushed to branch main at Arch Linux / Packaging / Packages / 
spdlog


Commits:
8d0ee1db by Carl Smedstad at 2024-09-08T18:27:03+02:00
upgpkg: 1.14.1-3: Re-enable tests + add implicitly satisfied deps

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,11 +1,14 @@
 pkgbase = spdlog
        pkgdesc = Very fast, header-only/compiled, C++ logging library
        pkgver = 1.14.1
-       pkgrel = 2
+       pkgrel = 3
        url = https://github.com/gabime/spdlog
        arch = x86_64
        license = MIT
        makedepends = cmake
+       makedepends = catch2
+       depends = gcc-libs
+       depends = glibc
        depends = libfmt.so
        provides = libspdlog.so
        source = 
spdlog-1.14.1.tar.gz::https://github.com/gabime/spdlog/archive/v1.14.1.tar.gz


=====================================
PKGBUILD
=====================================
@@ -4,13 +4,20 @@
 
 pkgname=spdlog
 pkgver=1.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Very fast, header-only/compiled, C++ logging library'
 arch=('x86_64')
 url='https://github.com/gabime/spdlog'
 license=('MIT')
-depends=('libfmt.so')
-makedepends=('cmake')
+depends=(
+    'gcc-libs'
+    'glibc'
+    'libfmt.so'
+)
+makedepends=(
+    'cmake'
+    'catch2'
+)
 source=(
     
"$pkgname-$pkgver.tar.gz::https://github.com/gabime/spdlog/archive/v$pkgver.tar.gz";
     "spdlog_fmt_external.patch"
@@ -31,26 +38,23 @@ prepare() {
 }
 
 build() {
-    export CFLAGS+=" ${CPPFLAGS}"
-    export CXXFLAGS+=" ${CPPFLAGS}"
-    # FIXME: Stop -DSPDLOG_BUILD_TESTS=ON from downloading bundled catch2
     cmake -B build -S "$pkgname-$pkgver" \
         -DSPDLOG_BUILD_BENCH=OFF \
         -DSPDLOG_FMT_EXTERNAL=ON \
         -DSPDLOG_BUILD_SHARED=ON \
+        -DSPDLOG_BUILD_TESTS=ON \
         -DCMAKE_BUILD_TYPE=None \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib \
         -Wno-dev
-    make -C build
+    cmake --build build
 }
 
-# See FIXME above
-#check() {
-#    make -C build test
-#}
+check() {
+    cmake --build build --target test
+}
 
 package() {
-    make -C build DESTDIR="$pkgdir" install
-    install -Dm644 "$pkgname-$pkgver/LICENSE" -t 
"$pkgdir/usr/share/licenses/$pkgname/"
+    DESTDIR="$pkgdir" cmake --install build
+    install -vDm644 "$pkgname-$pkgver/LICENSE" -t 
"$pkgdir/usr/share/licenses/$pkgname/"
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/spdlog/-/commit/8d0ee1dba55e3752952dc07136d395781b7390c8

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


Reply via email to