[arch-commits] Commit in range-v3/trunk (PKGBUILD)

[Sven-Hendrik Haase via arch-commits]

    Date: Monday, July 27, 2020 @ 08:12:55
  Author: svenstaro
Revision: 665410

upgpkg: range-v3 0.10.0-2: Properly rename modulemap (FS#67143)

Modified:
  range-v3/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-07-27 07:43:58 UTC (rev 665409)
+++ PKGBUILD    2020-07-27 08:12:55 UTC (rev 665410)
@@ -3,31 +3,27 @@
 
 pkgname=range-v3
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Experimental range library for C++11/14/17"
 arch=('any')
 url='https://github.com/ericniebler/range-v3'
 license=('custom')
-makedepends=('cmake')
-source=("https://github.com/ericniebler/range-v3/archive/${pkgver}.tar.gz";)
+makedepends=('cmake' 'ninja')
+source=("$pkgname-pkgver.tar.gz::https://github.com/ericniebler/range-v3/archive/${pkgver}.tar.gz";)
 
sha512sums=('4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723')
 
-prepare() {
-    cd "${srcdir}/range-v3-${pkgver}"
-    rm -rf build && mkdir build
-}
-
 build() {
     cd "${srcdir}/range-v3-${pkgver}"
 
-    cd build
-    cmake .. \
+    cmake . \
+        -Bbuild \
+        -GNinja \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DRANGE_V3_TESTS=OFF \
         -DRANGE_V3_HEADER_CHECKS=OFF \
         -DRANGE_V3_EXAMPLES=OFF \
         -DRANGE_V3_PERF=OFF
-    make
+    ninja -C build
 }
 
 package() {
@@ -34,6 +30,6 @@
     cd "${srcdir}/range-v3-${pkgver}"
     install -Dm644 "LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-    cd build
-    make DESTDIR="${pkgdir}/" install
+    DESTDIR="${pkgdir}/" ninja -C build install
+    mv "$pkgdir"/usr/include/module.modulemap 
"$pkgdir"/usr/include/range-v3.modulemap
 }