From b4507926f2c15c9686b02e0346dfc0983c9b2bc6 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Wed, 17 Apr 2024 21:23:46 +0200
Subject: [PATCH] main/boost1.82: please linter and cleanup
---
main/boost1.82/APKBUILD | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/main/boost1.82/APKBUILD b/main/boost1.82/APKBUILD
index 3f2bcb65bebf..d6102ce927eb 100644
--- a/main/boost1.82/APKBUILD
+++ b/main/boost1.82/APKBUILD
@@ -61,7 +61,7 @@ _libs="
nowide
"
for _lib in $_libs; do
- subpackages="$subpackages $pkgname-${_lib}:_boostlib"
+ subpackages="$subpackages $pkgname-$_lib:_boostlib"
done; unset -v _lib
subpackages="$subpackages $pkgname-libs"
@@ -144,8 +144,7 @@ package() {
--libdir="$pkgdir"/usr/lib \
install
- install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp
- install -Dm755 b2 "$pkgdir"/usr/bin/b2
+ install -Dm755 -t "$pkgdir"/usr/bin dist/bin/bcp b2
ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary
}
@@ -162,9 +161,8 @@ static() {
}
_boostlib() {
- local name="${subpkgname#$pkgname-}"
+ local name="${subpkgname#"$pkgname"-}"
pkgdesc="Boost $name shared library"
- depends="$depends__boostlib"
# Claim the unversioned name, this must be removed once we switch our
# boost to a new version
@@ -190,14 +188,11 @@ libs() {
done
mkdir -p "$subpkgdir"
- rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
}
dev() {
- # Claim the unversioned name, this must be removed once we switch our
- # boost to a new version. Replace previous boost version for clean -dev
- # upgrade
default_dev
+ # Replace previous boost version for clean -dev upgrade
replaces="boost$_previousver-dev"
}
--
GitLab