From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D261158041 for ; Sat, 24 Feb 2024 02:30:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 981CFE29FC; Sat, 24 Feb 2024 02:30:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71FACE29FC for ; Sat, 24 Feb 2024 02:30:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5835E3430C0 for ; Sat, 24 Feb 2024 02:30:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DEDA1121 for ; Sat, 24 Feb 2024 02:30:33 +0000 (UTC) From: "Maciej Mrozowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Mrozowski" Message-ID: <1708741632.9330eb9f29b5b5e844dbaa641d5543fa273e53a6.reavertm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/dynlink-scanner X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski X-VCS-Revision: 9330eb9f29b5b5e844dbaa641d5543fa273e53a6 X-VCS-Branch: master Date: Sat, 24 Feb 2024 02:30:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee7b0de4-3964-443a-ab9a-bc8b7405f7a1 X-Archives-Hash: f909236c3f42ea85b00ccfd18186865f commit: 9330eb9f29b5b5e844dbaa641d5543fa273e53a6 Author: Maciej Mrozowski gentoo org> AuthorDate: Sat Feb 24 02:27:12 2024 +0000 Commit: Maciej Mrozowski gentoo org> CommitDate: Sat Feb 24 02:27:12 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9330eb9f Documentation: update dynlink-scanner Signed-off-by: Maciej Mrozowski gentoo.org> Documentation/maintainers/dynlink-scanner | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Documentation/maintainers/dynlink-scanner b/Documentation/maintainers/dynlink-scanner index 153edd0e4d..90162c8f83 100755 --- a/Documentation/maintainers/dynlink-scanner +++ b/Documentation/maintainers/dynlink-scanner @@ -16,11 +16,6 @@ get_link_deps() # Print linking deps for given executable or shared object in alphabetical order. # Also try to dlopen shared objects in order to detect missing/broken dependencies. if [[ "$1" = --linking-deps ]]; then - # Sanity check, file-5.12 is broken, bail out early - if [[ `file --version | grep --color=never file- | cut -d'-' -f2` == '5.12' ]]; then - echo "file-5.12 is broken, bailing out" - exit 1 - fi mime=`file -b --mime-type "$2"` if [[ "$mime" == 'application/x-pie-executable' ]] || [[ "$mime" == 'application/x-executable' ]] || [[ "${mime}" == 'application/x-sharedlib' ]]; then LINK=`get_link_deps "$2"` @@ -39,6 +34,12 @@ if ! portageq has_version $ROOT/ $1; then exit 1 fi +# Sanity check, file-5.12 is broken, bail out early +if [[ `file --version | grep --color=never file- | cut -d'-' -f2` == '5.12' ]]; then + echo "file-5.12 is broken, bailing out" + exit 1 +fi + # Compile dlopen test application, we will use it to check for broken linking dependencies gcc "`dirname $0`/try_dlopen.c" -o /tmp/try_dlopen -ldl @@ -48,7 +49,7 @@ for cpv in `portageq match $ROOT/ $1`; do # For each file that belongs to package # run dynlink-scanner --linking-deps to obtain its linking dependencies # Assign all linking deps to packages and print package names - qfile -R $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d' ' | sort -u + qfile -R $ROOT `portageq contents $ROOT/ $cpv | xargs -r -L 1 "$0" --linking-deps` | cut -f1 -d':' | sort -u done # Cleanup