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 0B3F213838B for ; Sun, 28 Sep 2014 17:11:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C810EE0992; Sun, 28 Sep 2014 17:11:52 +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 4D67DE0992 for ; Sun, 28 Sep 2014 17:11:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42FB7340249 for ; Sun, 28 Sep 2014 17:11:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DB5213A6 for ; Sun, 28 Sep 2014 17:11:49 +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: <1411921490.fb2c8202c7d12666f0e570bfde1fdaf385dff6d8.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: fb2c8202c7d12666f0e570bfde1fdaf385dff6d8 X-VCS-Branch: prefix Date: Sun, 28 Sep 2014 17:11:49 +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: e9ec2e47-d1b3-48b7-ad78-b1d4b2b5b0de X-Archives-Hash: 5371d44f140a1a919167580cb001f012 commit: fb2c8202c7d12666f0e570bfde1fdaf385dff6d8 Author: Fabian Groffen gentoo org> AuthorDate: Sun Sep 28 16:24:50 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Sep 28 16:24:50 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fb2c8202 Revert "install_qa_check_macho: introduce QA_INSTALL_NAME" Consensus said this was not the right way to go. See follow-up commit. This reverts commit 90691e509210bce88c715022eaba72fac5cf76b5. --- bin/misc-functions.sh | 22 +--------------------- man/ebuild.5 | 5 ----- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 6088966..9ce9df6 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -1098,27 +1098,7 @@ install_qa_check_macho() { fi done fi - - 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 + if [[ ! -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 ad6bf40..89bd6a2 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -799,11 +799,6 @@ 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