From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2993E13877A for ; Fri, 20 Jun 2014 18:51:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 270A5E09B9; Fri, 20 Jun 2014 18:51:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA822E09B9 for ; Fri, 20 Jun 2014 18:51:44 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3DC3340028 for ; Fri, 20 Jun 2014 18:51:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id BDD7A1831E for ; Fri, 20 Jun 2014 18:51:41 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1403290213.90691e509210bce88c715022eaba72fac5cf76b5.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: man/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh man/ebuild.5 X-VCS-Directories: man/ bin/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 90691e509210bce88c715022eaba72fac5cf76b5 X-VCS-Branch: prefix Date: Fri, 20 Jun 2014 18:51:41 +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-Archives-Salt: 5e013610-92df-40fe-a7da-1dbae5a80524 X-Archives-Hash: 8f0448972b209058a8c4e46b6e1b20ee commit: 90691e509210bce88c715022eaba72fac5cf76b5 Author: Fabian Groffen gentoo org> AuthorDate: Fri Jun 20 18:50:13 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jun 20 18:50:13 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=90691e50 install_qa_check_macho: introduce QA_INSTALL_NAME Allow certain install_names to be ignored when checking for validity. This is useful for libraries that will be managed by tools like eselect. --- bin/misc-functions.sh | 22 +++++++++++++++++++++- man/ebuild.5 | 5 +++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 9ce9df6..6088966 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -1098,7 +1098,27 @@ install_qa_check_macho() { fi done fi - if [[ ! -e ${D}${install_name} ]] ; then + + ignore= + qa_var="QA_INSTALL_NAME_${ARCH/-/_}" + eval "[[ -n \${!qa_var} ]] && QA_INSTALL_NAME=(\"\${${qa_var}[@]}\")" + if [[ ${#QA_INSTALL_NAME[@]} -gt 1 ]] ; then + for x in "${QA_INSTALL_NAME[@]}" ; do + [[ ${EPREFIX}/${x#/} == ${install_name} ]] && \ + ignore=true + done + else + local shopts=$- + set -o noglob + for x in ${QA_INSTALL_NAME} ; do + [[ ${EPREFIX}/${x#/} == ${install_name} ]] && \ + ignore=true + done + set +o noglob + set -${shopts} + fi + + if [[ -z ${ignore} && ! -e ${D}${install_name} ]] ; then eqawarn "QA Notice: invalid self-reference install_name ${install_name} in ${obj}" # remember we are in an implicit subshell, that's # why we touch a file here ... ideally we should be diff --git a/man/ebuild.5 b/man/ebuild.5 index 89bd6a2..ad6bf40 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -799,6 +799,11 @@ shared libraries that have SONAMEs but should not have a corresponding SONAME symlink in the same directory. The paths may contain regular expressions with escape\-quoted special characters. .TP +.B QA_INSTALL_NAME +This should contain a list of install_names (excluding leading EPREFIX +or EROOT) of shared libraries that are allowed, despite pointing to +something not available in the image directory. +.TP .B QA_AM_MAINTAINER_MODE This should contain a list of lines containing automake missing \-\-run commands. The lines may contain regular expressions with escape\-quoted