snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

hooks/prepare-32bit: correct devel packages matching 

fixes cases like 'ruby-devel-doc'
This commit is contained in:
Piotr Wójcik 2021-05-07 21:39:12 +02:00 committed by Piotr
parent 3a52372eea
commit 7845fa8c53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/hooks/pre-pkg/05-prepare-32bit.sh
View File

@ -97,7 +97,7 @@ hook() {
pkgv="$($XBPS_UHELPER_CMD getpkgdepversion ${f})" pkgv="$($XBPS_UHELPER_CMD getpkgdepversion ${f})"
fi fi
# If dependency is a development pkg switch it to 32bit. # If dependency is a development pkg switch it to 32bit.
if [[ $pkgn =~ '-devel' ]]; then if [[ $pkgn == *-devel ]]; then
echo " RDEP: $f -> ${pkgn}-32bit${pkgv} (development)" echo " RDEP: $f -> ${pkgn}-32bit${pkgv} (development)"
printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
continue continue
@ -153,7 +153,7 @@ hook() {
ln -sfr ${destdir32}/usr/lib32/$f ${destdir32}/usr/lib/$f ln -sfr ${destdir32}/usr/lib32/$f ${destdir32}/usr/lib/$f
done done
# If it's a development pkg add a dependency to the 64bit pkg. # If it's a development pkg add a dependency to the 64bit pkg.
if [[ $pkgname =~ '-devel' ]]; then if [[ $pkgn == *-devel ]]; then
echo " RDEP: ${pkgver}" echo " RDEP: ${pkgver}"
printf "${pkgver} " >> ${destdir32}/rdeps printf "${pkgver} " >> ${destdir32}/rdeps
fi fi