From e6fef781f63c0077f6e75f865bd133ab4f22b83e Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Fri, 16 Sep 2022 19:07:29 +0200 Subject: [PATCH 1/2] community/double-conversion: upgrade to 3.2.1 --- community/double-conversion/APKBUILD | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/community/double-conversion/APKBUILD b/community/double-conversion/APKBUILD index f762974c239..d1527e05028 100644 --- a/community/double-conversion/APKBUILD +++ b/community/double-conversion/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Marian Buschsieweke pkgname=double-conversion -pkgver=3.1.5 +pkgver=3.2.1 pkgrel=0 pkgdesc="Binary-decimal and decimal-binary routines for IEEE doubles" url="https://github.com/google/double-conversion" @@ -10,6 +10,10 @@ makedepends="cmake" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/google/double-conversion/archive/v$pkgver.tar.gz" +case "$CARCH" in +x86) options="$options !check" ;; # SIGABRT in tests +esac + prepare() { default_prepare mkdir -p build @@ -36,4 +40,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a double-conversion-3.1.5.tar.gz" +sha512sums=" +d2feb3098a1d4d6baab5f89bcc29ac2e06d314d552b8c747c6eb6dba5dd165a15dc71200191edb7f05d521c349e12d59cddba3c5db101e1623e0e76e19f21a49 double-conversion-3.2.1.tar.gz +" -- GitLab From eba6fbec546354f8fcc60d0a3343a22c52bf565f Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Tue, 11 Oct 2022 12:09:33 +0200 Subject: [PATCH 2/2] community/double-conversion: build with samurai --- community/double-conversion/APKBUILD | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/community/double-conversion/APKBUILD b/community/double-conversion/APKBUILD index d1527e05028..5b076f91f2b 100644 --- a/community/double-conversion/APKBUILD +++ b/community/double-conversion/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="Binary-decimal and decimal-binary routines for IEEE doubles" url="https://github.com/google/double-conversion" arch="all" license="BSD-3-Clause" -makedepends="cmake" +makedepends="cmake samurai" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/google/double-conversion/archive/v$pkgver.tar.gz" @@ -14,20 +14,13 @@ case "$CARCH" in x86) options="$options !check" ;; # SIGABRT in tests esac -prepare() { - default_prepare - mkdir -p build -} - build() { - cd build - - cmake .. \ + cmake -B build -G Ninja \ -DBUILD_TESTING=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=ON - make + cmake --build build } check() { @@ -36,8 +29,7 @@ check() { } package() { - cd build - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } sha512sums=" -- GitLab