From 48ff21862676e392500fcb7716f3d9d16dd84b61 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 8 Nov 2020 11:08:25 +0000 Subject: [PATCH] fmt: updated cmake syntax --- fmt/.signature | 4 ++-- fmt/Pkgfile | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fmt/.signature b/fmt/.signature index d57d34e3a..3c63dc24e 100644 --- a/fmt/.signature +++ b/fmt/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39cjaNbBgFMjiO4QMPRE70xLr9rTycxm/vmowqowr/8MoInv0cdL6v6eeW4vJIuQhET7+E1XxRohsxj19YWxhwk= -SHA256 (Pkgfile) = 46824573f6d4ac245cad683a7bc35d96c333befabaf1b7ec7613f387fa375e62 +RWSagIOpLGJF302ToHWJwYywASlXN80CtgBSpi1LXNl83OEn/SxOzDU2yv5VFSPouVDg72hIEWLcT1aB1unzrP0Yw4Nmtz3esAo= +SHA256 (Pkgfile) = 3119eacf919d0aeaf5bcb750c91711eb45caeaa19bc65c376f4ed8600df11909 SHA256 (.footprint) = 4b890f044167a1c6f8594cf4019b1cf0eb9b8fd3eb6b7779f0e88c18b757a456 SHA256 (fmt-7.1.2.tar.gz) = 4119a1c34dff91631e1d0a3707428f764f1ea22fe3cd5e70af5b4ccd5513831c diff --git a/fmt/Pkgfile b/fmt/Pkgfile index a0e5d08fb..06104445c 100644 --- a/fmt/Pkgfile +++ b/fmt/Pkgfile @@ -9,10 +9,14 @@ release=1 source=(https://github.com/fmtlib/$name/archive/$version/$name-$version.tar.gz) build() { - [[ -e /usr/bin/ninja ]] && PKGMK_FMT_OPTIONS=' -GNinja' - cmake -S$name-$version -Bbuild $PKGMK_FMT_OPTIONS \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib + [[ -e /usr/bin/ninja ]] && PKGMK_FMT+=' -G Ninja' + cmake -S $name-$version -B build $PKGMK_FMT \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ + -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build }