diff options
author | Juan RP <xtraeme@gmail.com> | 2014-09-10 11:04:46 +0000 |
---|---|---|
committer | Juan RP <xtraeme@gmail.com> | 2014-09-10 11:04:46 +0000 |
commit | 26d7f0885c2ecaaf8064188849df38cca680f123 (patch) | |
tree | 760b8f2272f9606501745d4024367719185ef18f /common/hooks/post-install/99-pkglint.sh | |
parent | a149d9dee6e9d64415a83a251a26c65adfa84493 (diff) | |
download | void-packages-26d7f0885c2ecaaf8064188849df38cca680f123.tar void-packages-26d7f0885c2ecaaf8064188849df38cca680f123.tar.gz void-packages-26d7f0885c2ecaaf8064188849df38cca680f123.tar.bz2 void-packages-26d7f0885c2ecaaf8064188849df38cca680f123.tar.lz void-packages-26d7f0885c2ecaaf8064188849df38cca680f123.tar.xz void-packages-26d7f0885c2ecaaf8064188849df38cca680f123.tar.zst void-packages-26d7f0885c2ecaaf8064188849df38cca680f123.zip |
xbps-src: fix the mess with the pkglint hook and glibc dynamic linker sonames.
Diffstat (limited to 'common/hooks/post-install/99-pkglint.sh')
-rw-r--r-- | common/hooks/post-install/99-pkglint.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/common/hooks/post-install/99-pkglint.sh b/common/hooks/post-install/99-pkglint.sh index af6e4e7be87..b2993d00971 100644 --- a/common/hooks/post-install/99-pkglint.sh +++ b/common/hooks/post-install/99-pkglint.sh @@ -2,7 +2,7 @@ hook() { local error=0 filename= rev= libname= conflictPkg= conflictFile= - conflictRev= found= mapshlibs=$XBPS_COMMONDIR/shlibs + local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs set +E @@ -33,15 +33,17 @@ hook() { _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g') _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g') if [ "$rev" = "$filename" ]; then - _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" + _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+" else - _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+$" + _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+" fi grep -E "${_pattern}" $mapshlibs | { \ - while read conflictFile conflictPkg; do + while read conflictFile conflictPkg ignore; do found=1 conflictRev=${conflictFile#*.so.} - if [ "$rev" = "$conflictRev" ]; then + if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then + continue + elif [ "$rev" = "$conflictRev" ]; then continue elif [[ ${rev}.* =~ $conflictRev ]]; then continue |