commit: b1334cea92b0b7903dab6d6940265b977e2b1a4f parent 1083e7ed92cd37b578051636b90af9cdfa0c64ac Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Mon, 16 Sep 2024 01:06:55 +0200 lanodan/utils: bump to utils-std-69fb55fDiffstat:
| A | lanodan/utils-std/APKBUILD | 67 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| D | lanodan/utils/APKBUILD | 30 | ------------------------------ |
2 files changed, 67 insertions(+), 30 deletions(-)diff --git a/lanodan/utils-std/APKBUILD b/lanodan/utils-std/APKBUILD@@ -0,0 +1,67 @@ +# Maintainer: Haelwenn (lanodan) Monnier <contact+alpine@hacktivis.me> +pkgname=utils-std +pkgver=0_git20240915 +_git_commit=69fb55f +pkgrel=1 +pkgdesc="Collection of commonly available Unix tools" +url="https://hacktivis.me/git/utils-std" +arch="all" +license="MPL-2.0 0BSD BSD-2-Clause BSD-3-Clause CC0-1.0 GFDL-1.1-only WTFPL" +options="!check" +makedepends="cmd:m4 cmd:yacc" +checkdepends="mandoc atf kyua" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-strings $pkgname-strings-doc:strings_doc" +source="https://hacktivis.me/releases/utils-std/$pkgname-$_git_commit.tar.gz" +builddir="$srcdir/$pkgname-$_git_commit" + +build() { + PREFIX=/usr CRAM=true ./configure + + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install + + # binaries that busybox puts in /bin (taken from coreutils/APKBUILD) + local busybox_bin="base64 cat chgrp chmod chown cp date dd df echo false ln ls + mkdir mknod mktemp mv nice printenv pwd rm rmdir sleep stat stty sync touch true uname" + + mkdir -p "$pkgdir"/bin/ + for i in $busybox_bin; do + test -f cmd/$i || continue + ln -s ../usr/bin/$i "$pkgdir"/bin/$i + done + + # resolve conflict with binutils for cmd:strings + rm "$pkgdir"/usr/bin/strings "$pkgdir"/usr/share/man/man1/strings.1 + + # ERROR: utils-std-doc-0_git20240915-r0: trying to overwrite usr/share/man/man1/renice.1.gz owned by util-linux-doc-2.40.1-r1. + # ERROR: utils-std-doc-0_git20240915-r0: trying to overwrite usr/share/man/man1/time.1.gz owned by man-pages-6.8-r0. + rm "$pkgdir"/usr/share/man/man1/renice.1 "$pkgdir"/usr/share/man/man1/time.1 +} + +strings() { + mkdir -p "$subpkgdir"/usr/bin/ + cp -p "$builddir"/cmd/strings "$subpkgdir"/usr/bin/ +} + +strings_doc() { + local gzip=$(command -v pigz || echo gzip) + depends="$depends_doc" + install_if="docs $pkgname-strings=$pkgver-r$pkgrel" + + mkdir -p "$subpkgdir"/usr/share/man/man1/ + cp -p "$builddir"/cmd/strings.1 "$subpkgdir"/usr/share/man/man1/ + + # ERROR: utils-std-strings-doc*: Found uncompressed man pages + gzip -n -9 "$subpkgdir"/usr/share/man/man1/strings.1 +} + +sha512sums=" +ea3698c8e68ea5578a046f7e5832868d0e3f8d3ab40d2a0fdf25d93b79ac24ca002a4c0fd7da8556e2078cac416098be4739e8c58388ec61ed67d6d49a2ba95a utils-std-69fb55f.tar.gz +"diff --git a/lanodan/utils/APKBUILD b/lanodan/utils/APKBUILD@@ -1,30 +0,0 @@ -# Maintainer: Haelwenn (lanodan) Monnier <contact+alpine@hacktivis.me> -pkgname=utils -pkgver=0.0.1 -pkgrel=0 -pkgdesc="Small POSIX-ish replacements to coreutils plus few extras" -url="https://hacktivis.me/git/utils" -arch="all" -license="GPL-2.0-only GPL-3.0-only" -makedepends="" -checkdepends="mandoc atf kyua" -subpackages="$pkgname-dbg $pkgname-doc" -source="https://hacktivis.me/releases/utils-$pkgver.tar.gz" - -build() { - PREFIX=/usr CRAM=true ./configure - make -} - -check() { - # Ignore test results for now - make test || true -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums=" -09952ee93ac934edd1e18ba9fe8e9b72f3e6d9d70abc11993071b0edc0e7d87f80391ee0565c82e172b266df1671185b5a989540d4773cc946d1de009606e54e utils-0.0.1.tar.gz -"