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

xbps-src: fix the mess with the pkglint hook and glibc dynamic linker sonames.

This commit is contained in:
Juan RP 2014-09-10 13:04:46 +02:00
parent a149d9dee6
commit 26d7f0885c
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/hooks/post-install/99-pkglint.sh
View File

@ -2,7 +2,7 @@
hook() { hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile= local error=0 filename= rev= libname= conflictPkg= conflictFile=
conflictRev= found= mapshlibs=$XBPS_COMMONDIR/shlibs local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
set +E set +E
@ -33,15 +33,17 @@ hook() {
_shlib=$(echo "$libname"|sed -E 's|\+|\\+|g') _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
_pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g') _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
if [ "$rev" = "$filename" ]; then if [ "$rev" = "$filename" ]; then
_pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
else else
_pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
fi fi
grep -E "${_pattern}" $mapshlibs | { \ grep -E "${_pattern}" $mapshlibs | { \
while read conflictFile conflictPkg; do while read conflictFile conflictPkg ignore; do
found=1 found=1
conflictRev=${conflictFile#*.so.} conflictRev=${conflictFile#*.so.}
if [ "$rev" = "$conflictRev" ]; then if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
continue
elif [ "$rev" = "$conflictRev" ]; then
continue continue
elif [[ ${rev}.* =~ $conflictRev ]]; then elif [[ ${rev}.* =~ $conflictRev ]]; then
continue continue

7
common/shlibs
View File

@ -22,10 +22,11 @@ libm.so.6 glibc-2.8_1
libpthread.so.0 glibc-2.8_1 libpthread.so.0 glibc-2.8_1
librt.so.1 glibc-2.8_1 librt.so.1 glibc-2.8_1
libdl.so.2 glibc-2.8_1 libdl.so.2 glibc-2.8_1
ld-linux-x86-64.so.2 glibc-2.8_1 ld-linux-x86-64.so.2 glibc-2.8_1 x86_64
ld-linux.so.2 glibc-2.8_1 ld-linux.so.2 glibc-2.8_1 i686
ld-linux.so.3 glibc-2.17_1 armv5tel
ld.so.1 glibc-2.17_1 mips
ld-linux-armhf.so.3 glibc-2.17_1 ld-linux-armhf.so.3 glibc-2.17_1
ld-linux.so.3 glibc-2.17_1
libresolv.so.2 glibc-2.8_1 libresolv.so.2 glibc-2.8_1
libanl.so.1 glibc-2.8_1 libanl.so.1 glibc-2.8_1
libthread_db.so.1 glibc-2.8_1 libthread_db.so.1 glibc-2.8_1