From 7845fa8c53d2a7bfaf025df53d412961328bba99 Mon Sep 17 00:00:00 2001 From: Piotr Wójcik Date: Fri, 7 May 2021 21:39:12 +0200 Subject: hooks/prepare-32bit: correct devel packages matching fixes cases like 'ruby-devel-doc' --- common/hooks/pre-pkg/05-prepare-32bit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh index c293222586f..9aa6cae7dc7 100644 --- a/common/hooks/pre-pkg/05-prepare-32bit.sh +++ b/common/hooks/pre-pkg/05-prepare-32bit.sh @@ -97,7 +97,7 @@ hook() { pkgv="$($XBPS_UHELPER_CMD getpkgdepversion ${f})" fi # 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)" printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps continue @@ -153,7 +153,7 @@ hook() { ln -sfr ${destdir32}/usr/lib32/$f ${destdir32}/usr/lib/$f done # If it's a development pkg add a dependency to the 64bit pkg. - if [[ $pkgname =~ '-devel' ]]; then + if [[ $pkgn == *-devel ]]; then echo " RDEP: ${pkgver}" printf "${pkgver} " >> ${destdir32}/rdeps fi -- cgit v1.2.3