[gentoo-commits] proj/portage:prefix commit in: man/, bin/

[Fabian Groffen]

commit:     90691e509210bce88c715022eaba72fac5cf76b5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 18:50:13 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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