Skip to content
Snippets Groups Projects
Commit b4507926 authored by Sertonix's avatar Sertonix Committed by Natanael Copa
Browse files

main/boost1.82: please linter and cleanup

parent 5902dd62
No related branches found
No related tags found
No related merge requests found
...@@ -61,7 +61,7 @@ _libs=" ...@@ -61,7 +61,7 @@ _libs="
nowide nowide
" "
for _lib in $_libs; do for _lib in $_libs; do
subpackages="$subpackages $pkgname-${_lib}:_boostlib" subpackages="$subpackages $pkgname-$_lib:_boostlib"
done; unset -v _lib done; unset -v _lib
subpackages="$subpackages $pkgname-libs" subpackages="$subpackages $pkgname-libs"
...@@ -144,8 +144,7 @@ package() { ...@@ -144,8 +144,7 @@ package() {
--libdir="$pkgdir"/usr/lib \ --libdir="$pkgdir"/usr/lib \
install install
install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp install -Dm755 -t "$pkgdir"/usr/bin dist/bin/bcp b2
install -Dm755 b2 "$pkgdir"/usr/bin/b2
ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary
} }
...@@ -162,9 +161,8 @@ static() { ...@@ -162,9 +161,8 @@ static() {
} }
_boostlib() { _boostlib() {
local name="${subpkgname#$pkgname-}" local name="${subpkgname#"$pkgname"-}"
pkgdesc="Boost $name shared library" pkgdesc="Boost $name shared library"
depends="$depends__boostlib"
# Claim the unversioned name, this must be removed once we switch our # Claim the unversioned name, this must be removed once we switch our
# boost to a new version # boost to a new version
...@@ -190,14 +188,11 @@ libs() { ...@@ -190,14 +188,11 @@ libs() {
done done
mkdir -p "$subpkgdir" mkdir -p "$subpkgdir"
rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
} }
dev() { 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 default_dev
# Replace previous boost version for clean -dev upgrade
replaces="boost$_previousver-dev" replaces="boost$_previousver-dev"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment