| index : builder | |
| Archlinux32 build system | gitolite user |
| summaryrefslogtreecommitdiff |
| -rwxr-xr-x | bin/build-packages | 32 |
diff --git a/bin/build-packages b/bin/build-packages index ef96690..470065a 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -778,23 +778,23 @@ while [ "${count}" -ne 0 ] && \ D } ' "${pkgfile}.so.needs" - qt_version=$( - sed ' - s/^installed = qt[0-9]\+-\S\+-\([0-9.]\+\)\(-[^-]\+\)\{2\}$/\1/ - t - d - ' "${package_content_dir}/${pkgfile##*/}/.BUILDINFO" | \ - sort -u - ) - if [ -n "${qt_version}" ] && \ - [ "$(printf '%s\n' "${qt_version}" | wc -l)" -eq 1 ]; then - sed ' - s/^depend = \(qt5-\S\+\)$/\1='"${qt_version}"'/ - t - d - ' "${package_content_dir}/${pkgfile##*/}/.PKGINFO" >> \ + sed ' + s/^installed = \(qt[0-9]\+-\S\+\)-\([0-9.]\+\)\(-[^-]\+\)\{2\}$/\1 \2/ + t + d + ' "${package_content_dir}/${pkgfile##*/}/.BUILDINFO" | \ + sort -u | \ + sort -k1,1 > \ + "${tmp_dir}/installed-qt-versions" + sed ' + s/^depend = \(qt[0-9]\+-\S\+\)$/\1/ + t + d + ' "${package_content_dir}/${pkgfile##*/}/.PKGINFO" | \ + sort -u | \ + join -1 1 -2 1 -o 2.1,2.2 - "${tmp_dir}/installed-qt-versions" | \ + tr ' ' '=' >> \ "${pkgfile}.so.needs" - fi find "${package_content_dir}/${pkgfile##*/}" \ -name 'opt' -prune , \ \( -type f -o -type l \) \ |