jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

05-prepare-32bit.sh: remove dirname usage

Browse source
This commit is contained in:
maxice8 2019-04-13 17:47:41 -03:00 committed by maxice8
parent 5b26fde9c0
commit 26d73d5ede
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

@ -149,14 +149,14 @@ hook() {
# Also install additional files set via "lib32files". # Also install additional files set via "lib32files".
for f in ${lib32files}; do for f in ${lib32files}; do
echo "$pkgver: installing additional files: $f ..." echo "$pkgver: installing additional files: $f ..."
_targetdir=${destdir32}/$(dirname ${f}) _targetdir=${destdir32}/${f%/*}/
mkdir -p ${_targetdir/\/usr\/lib/\/usr\/lib32} mkdir -p ${_targetdir/\/usr\/lib/\/usr\/lib32}
cp -a ${PKGDESTDIR}/${f} ${_targetdir/\/usr\/lib/\/usr\/lib32} cp -a ${PKGDESTDIR}/${f} ${_targetdir/\/usr\/lib/\/usr\/lib32}
done done
# Additional symlinks to the native libdir. # Additional symlinks to the native libdir.
for f in ${lib32symlinks}; do for f in ${lib32symlinks}; do
echo "$pkgver: symlinking $f to the native libdir..." echo "$pkgver: symlinking $f to the native libdir..."
mkdir -p ${destdir32}/usr/lib{,32}/$(dirname ${f}) mkdir -p ${destdir32}/usr/lib{,32}/${f%/*}/
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.