From b5edc518ae86e085bf5a189a9229092d7c7f0608 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 8 Nov 2020 11:41:27 +0000 Subject: [PATCH] libebml: updated cmake syntax --- libebml/.signature | 4 ++-- libebml/Pkgfile | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libebml/.signature b/libebml/.signature index da7d1c01c..7a835c25c 100644 --- a/libebml/.signature +++ b/libebml/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35tCjJ6I/GngDKu/80+iLD4AWQ6at2pnEEeL86bqLpYvR2uuH+avMvxy2DTQlOpcGz+C6iwK7dbUKK77by7w5QM= -SHA256 (Pkgfile) = 720b0f8b8b5f8b419cbcd162a5d1a3c5d617e52914efed041525c7f74bba6d67 +RWSagIOpLGJF3xyFd695HiWxRKpQd/XUTWu4kDSa0dMa+PPjann/Uk8GY5WGsBuQWlGyNPO6mf8KN2AaNe099/q/D0cQkXKYsQA= +SHA256 (Pkgfile) = 08759cf25f5f90cf973ec05a086cb754b0b968aeec0d247f50cb2a286c35bde4 SHA256 (.footprint) = 544f95100b22804152c894eef787a4c56485af7619fc745d26f072742172c902 SHA256 (libebml-1.4.0.tar.xz) = 80abc9a82549615018798ee704997270a39b43de9a6e7e0d23b62f8ce682c4b3 diff --git a/libebml/Pkgfile b/libebml/Pkgfile index e9ee15fa9..21272cb8e 100644 --- a/libebml/Pkgfile +++ b/libebml/Pkgfile @@ -9,15 +9,15 @@ release=1 source=(https://dl.matroska.org/downloads/$name/$name-$version.tar.xz) build() { - [[ -e /usr/bin/ninja ]] && PKGMK_LIBEBML_OPTIONS=' -GNinja' - cmake -S$name-$version -Bbuild $PKGMK_LIBEBML_OPTIONS \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ - -DCMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ - -Wno-dev \ - -DBUILD_SHARED_LIBS=ON + [[ -e /usr/bin/ninja ]] && PKGMK_LIBEBML+=' -G Ninja' + cmake -S $name-$version -B build $PKGMK_LIBEBML \ + -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" \ + -D BUILD_SHARED_LIBS=ON \ + -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build