[arch-commits] Commit in check/repos/extra-x86_64 (PKGBUILD PKGBUILD no-static.diff)

[Jan Steffens]

    Date: Friday, October 2, 2020 @ 21:22:24
  Author: heftig
Revision: 397121

archrelease: copy trunk to extra-x86_64

Added:
  check/repos/extra-x86_64/PKGBUILD
    (from rev 397120, check/trunk/PKGBUILD)
  check/repos/extra-x86_64/no-static.diff
    (from rev 397120, check/trunk/no-static.diff)
Deleted:
  check/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |  148 ++++++++++++++++++++++++++++---------------------------
 no-static.diff |   13 ++++
 2 files changed, 90 insertions(+), 71 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-02 21:22:02 UTC (rev 397120)
+++ PKGBUILD	2020-10-02 21:22:24 UTC (rev 397121)
@@ -1,71 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Jeremy Cowgar <jeremy at cowgar.com>
-
-pkgbase=check
-pkgname=(check check-docs)
-pkgver=0.15.2
-pkgrel=1
-pkgdesc="A unit testing framework for C"
-url="https://libcheck.github.io/check/"
-arch=(x86_64)
-license=(LGPL)
-makedepends=(git texlive-bin texi2html doxygen awk cmake)
-_commit=11970a7e112dfe243a2e68773f014687df2900e8  # tags/0.15.2
-source=("git+https://github.com/libcheck/check#commit=$_commit")
-md5sums=('SKIP')
-
-pkgver() {
-  cd check
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd check
-  autoreconf -fvi
-}
-
-build() {
-  CFLAGS+=" -Wno-format-extra-args"
-
-  cmake -Hcheck -Bcmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCHECK_ENABLE_TIMEOUT_TESTS=OFF \
-    -DAWK_GSUB_DBL_BSLASH='\\\\'
-  cmake --build cmake
-
-  cd check
-  ./configure --prefix=/usr --disable-timeout-tests
-  make all doc/doxygen doc/check_html
-}
-
-check() {
-  CTEST_OUTPUT_ON_FAILURE=1 cmake --build cmake --target test
-
-  cd check
-  make check
-}
-
-package_check() {
-  depends=(awk)
-  optdepends=('check-docs: Documentation')
-  provides=(libcheck.so)
-
-  DESTDIR="$pkgdir" cmake --build cmake --target install
-
-  DESTDIR="$srcdir/tmp" make -C check install
-  mv tmp/usr/share/{aclocal,info} "$pkgdir/usr/share"
-  mv tmp/usr/share/doc .
-  rm -rv tmp
-}
-
-package_check-docs() {
-  pkgdesc+=" (documentation)"
-
-  cp -a check/doc/doxygen/html doc/check/doxygen
-  cp -a check/doc/check_html   doc/check/manual
-
-  mkdir -p "$pkgdir/usr/share"
-  mv doc "$pkgdir/usr/share"
-}

Copied: check/repos/extra-x86_64/PKGBUILD (from rev 397120, check/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-02 21:22:24 UTC (rev 397121)
@@ -0,0 +1,77 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Jeremy Cowgar <jeremy at cowgar.com>
+
+pkgbase=check
+pkgname=(check check-docs)
+pkgver=0.15.2
+pkgrel=2
+pkgdesc="A unit testing framework for C"
+url="https://libcheck.github.io/check/"
+arch=(x86_64)
+license=(LGPL)
+makedepends=(git texlive-bin texi2html doxygen awk cmake)
+_commit=11970a7e112dfe243a2e68773f014687df2900e8  # tags/0.15.2
+source=("git+https://github.com/libcheck/check#commit=$_commit"
+        no-static.diff)
+sha256sums=('SKIP'
+            '1151c40e5bfb08e77175f30f79daadc8c07021c980589a6b33c6f1cf224e48df')
+
+pkgver() {
+  cd check
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd check
+
+  # https://bugs.archlinux.org/task/68076
+  patch -Np1 -i ../no-static.diff
+
+  autoreconf -fvi
+}
+
+build() {
+  CFLAGS+=" -Wno-format-extra-args"
+
+  cmake -Hcheck -Bcmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCHECK_ENABLE_TIMEOUT_TESTS=OFF \
+    -DAWK_GSUB_DBL_BSLASH='\\\\'
+  cmake --build cmake
+
+  cd check
+  ./configure --prefix=/usr --disable-timeout-tests
+  make all doc/doxygen doc/check_html
+}
+
+check() {
+  CTEST_OUTPUT_ON_FAILURE=1 cmake --build cmake --target test
+
+  cd check
+  make check
+}
+
+package_check() {
+  depends=(awk)
+  optdepends=('check-docs: Documentation')
+  provides=(libcheck.so)
+
+  DESTDIR="$pkgdir" cmake --build cmake --target install
+
+  DESTDIR="$srcdir/tmp" make -C check install
+  mv tmp/usr/share/{aclocal,info} "$pkgdir/usr/share"
+  mv tmp/usr/share/doc .
+  rm -rv tmp
+}
+
+package_check-docs() {
+  pkgdesc+=" (documentation)"
+
+  cp -a check/doc/doxygen/html doc/check/doxygen
+  cp -a check/doc/check_html   doc/check/manual
+
+  mkdir -p "$pkgdir/usr/share"
+  mv doc "$pkgdir/usr/share"
+}

Copied: check/repos/extra-x86_64/no-static.diff (from rev 397120, check/trunk/no-static.diff)
===================================================================
--- no-static.diff	                        (rev 0)
+++ no-static.diff	2020-10-02 21:22:24 UTC (rev 397121)
@@ -0,0 +1,13 @@
+diff --git i/src/CMakeLists.txt w/src/CMakeLists.txt
+index 4a02dbe..4d731c9 100644
+--- i/src/CMakeLists.txt
++++ w/src/CMakeLists.txt
+@@ -188,7 +188,7 @@ target_include_directories(checkShared
+ )
+ 
+ if(NOT THIS_IS_SUBPROJECT)
+-  install(TARGETS check checkShared
++  install(TARGETS checkShared
+     EXPORT check-targets
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}