From 5ec23b44a5946590bb9efe0bba7c2b037585ae0f Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 8 Nov 2020 09:31:07 +0000 Subject: [PATCH] arpon: updated cmake syntax --- arpon/.signature | 4 ++-- arpon/Pkgfile | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arpon/.signature b/arpon/.signature index 38484c22e..b07aa8990 100644 --- a/arpon/.signature +++ b/arpon/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32pqn+zyC3a8T+xJEU3dh1FPYE52F38Eruz9ZLjT8M0DPx9EOZtyGgzYEx3cj+upjMR5z5hxOaUO0PwMaJ0QAwg= -SHA256 (Pkgfile) = 6b9c5c177e4a283bfee78787d9ed864e1e39b5bdc6f34793d64190f246afc4c8 +RWSagIOpLGJF306o/4y2Oqshh8RzR+JA94lACeUVKboo+plyEchz5xRHujIKPvo69M0FeS40JfOl0TkJ8w3hnEN03LMjwFOmKg8= +SHA256 (Pkgfile) = ac004f106f5cabc638663d0840c395c9b88e49dcbb4a219ed3d0833e2070304a SHA256 (.footprint) = 8025ac39d61d0f228f05023a9c995fde0a026ba3943a69af1c517e8ea46747dd SHA256 (ArpON-3.0-ng.tar.gz) = ea55d1641b4573b19103ca596368e418aecd2a1409adbdce3a9f76dc8ebad590 SHA256 (arpon) = 295d1363e52e0c0f4799651a0da2e60d6da0178b5eac8276fb256fc47feae2c6 diff --git a/arpon/Pkgfile b/arpon/Pkgfile index c610c0597..2ac808cc1 100644 --- a/arpon/Pkgfile +++ b/arpon/Pkgfile @@ -16,10 +16,13 @@ build() { patch -Np2 -d ArpON-$version -i $SRC/arpon-gcc7.patch patch -Np2 -d ArpON-$version -i $SRC/arpon-syslog.patch - cmake -SArpON-$version -Bbuild \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS="-Wno-error=stringop-truncation" + [[ -e /usr/bin/ninja ]] && PKGMK_ARPON+=' -G Ninja' + cmake -S ArpON-$version -B build $PKGMK_ARPON \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG -Wno-error=stringop-truncation" \ + -W no-dev cmake --build build DESTDIR=$PKG cmake --install build rm -r $PKG/usr/share/doc