hooks/prepare-32bit: create packages from all *-devel
All *-devel dependencies of 32bit packages are replaced with *-devel-32bit. Missing dependencies made some uninstallable.
This commit is contained in:
parent
788458ffb5
commit
3680c424db
2 changed files with 12 additions and 5 deletions
|
@ -24,11 +24,15 @@ hook() {
|
||||||
# Library mode, copy only relevant files to new destdir.
|
# Library mode, copy only relevant files to new destdir.
|
||||||
#
|
#
|
||||||
# If /usr/lib does not exist don't continue...
|
# If /usr/lib does not exist don't continue...
|
||||||
if [ ! -d ${PKGDESTDIR}/usr/lib ]; then
|
# except for devel packages, for which empty 32bit package will be created
|
||||||
|
if ! [ -d ${PKGDESTDIR}/usr/lib ] && ! [[ ${pkgname} == *-devel ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p ${destdir32}/usr/lib32
|
mkdir -p ${destdir32}/usr/lib32
|
||||||
|
if [ -d ${PKGDESTDIR}/usr/lib ]; then
|
||||||
cp -a ${PKGDESTDIR}/usr/lib/* ${destdir32}/usr/lib32
|
cp -a ${PKGDESTDIR}/usr/lib/* ${destdir32}/usr/lib32
|
||||||
|
fi
|
||||||
|
|
||||||
# Only keep shared libs, static libs, and pkg-config files.
|
# Only keep shared libs, static libs, and pkg-config files.
|
||||||
find "${destdir32}" -not \( \
|
find "${destdir32}" -not \( \
|
||||||
|
@ -67,6 +71,9 @@ hook() {
|
||||||
mv ${destdir32}/usr/lib ${destdir32}/usr/lib32
|
mv ${destdir32}/usr/lib ${destdir32}/usr/lib32
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if [[ ${pkgname} == *-devel ]]; then
|
||||||
|
mkdir -p ${destdir32}
|
||||||
|
fi
|
||||||
if [ ! -d ${destdir32} ]; then
|
if [ ! -d ${destdir32} ]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -54,8 +54,8 @@ hook() {
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
# Forbid empty packages unless build_style=meta
|
# Forbid empty packages unless build_style=meta or it is 32bit devel package
|
||||||
if [ "$build_style" != meta -a "$emptypkg" != no ]; then
|
if [ "$build_style" != meta ] && [ "$emptypkg" != no ] && [[ ${pkgname} != *-devel-32bit ]]; then
|
||||||
msg_red "${pkgver}: PKGDESTDIR is empty and build_style != meta\n"
|
msg_red "${pkgver}: PKGDESTDIR is empty and build_style != meta\n"
|
||||||
error=1
|
error=1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue