diff options
author | Piotr Wójcik <chocimier@tlen.pl> | 2021-05-07 19:39:12 +0000 |
---|---|---|
committer | Piotr <chocimier@tlen.pl> | 2021-07-10 18:45:50 +0000 |
commit | 7845fa8c53d2a7bfaf025df53d412961328bba99 (patch) | |
tree | 5493939642cfd610ca66bdbb4f5ccfdf49b0e8b1 | |
parent | 3a52372eeaf2cdbb5f428f9e5ab469d2bd3bf7cd (diff) | |
download | void-packages-7845fa8c53d2a7bfaf025df53d412961328bba99.tar void-packages-7845fa8c53d2a7bfaf025df53d412961328bba99.tar.gz void-packages-7845fa8c53d2a7bfaf025df53d412961328bba99.tar.bz2 void-packages-7845fa8c53d2a7bfaf025df53d412961328bba99.tar.lz void-packages-7845fa8c53d2a7bfaf025df53d412961328bba99.tar.xz void-packages-7845fa8c53d2a7bfaf025df53d412961328bba99.tar.zst void-packages-7845fa8c53d2a7bfaf025df53d412961328bba99.zip |
hooks/prepare-32bit: correct devel packages matching
fixes cases like 'ruby-devel-doc'
-rw-r--r-- | common/hooks/pre-pkg/05-prepare-32bit.sh | 4 |
1 files 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 |