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

[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

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

[Fabian Groffen]

commit:     fb2c8202c7d12666f0e570bfde1fdaf385dff6d8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 28 16:24:50 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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

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

[Fabian Groffen]

commit:     2f3cde1d67e04cf01dae8ec8b1f2bf0515c153df
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 28 17:09:50 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 28 17:09:50 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2f3cde1d

install_qa_check_macho: introduce QA_IGNORE_INSTALL_NAME_FILES

Add QA_IGNORE_INSTALL_NAME_FILES containing a list for file to treat as
non-fatal when they have failures with install_names.

---
 bin/misc-functions.sh | 32 +++++++++++++++++++++++++-------
 man/ebuild.5          |  6 ++++++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 9ce9df6..d92103f 100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -1084,6 +1084,27 @@ install_qa_check_macho() {
 		install_name=${l%%;*}; l=${l#*;}
 		needed=${l%%;*}; l=${l#*;}
 
+		ignore=
+		qa_var="QA_IGNORE_INSTALL_NAME_FILES_${ARCH/-/_}"
+		eval "[[ -n \${!qa_var} ]] &&
+			QA_IGNORE_INSTALL_NAME_FILES=(\"\${${qa_var}[@]}\")"
+
+		if [[ ${#QA_IGNORE_INSTALL_NAME_FILES[@]} -gt 1 ]] ; then
+			for x in "${QA_IGNORE_INSTALL_NAME_FILES[@]}" ; do
+				[[ ${obj##*/} == ${x} ]] && \
+					ignore=true
+			done
+		else
+			local shopts=$-
+			set -o noglob
+			for x in ${QA_IGNORE_INSTALL_NAME_FILES} ; do
+				[[ ${obj##*/} == ${x} ]] && \
+					ignore=true
+			done
+			set +o noglob
+			set -${shopts}
+		fi
+
 		# See if the self-reference install_name points to an existing
 		# and to be installed file.  This usually is a symlink for the
 		# major version.
@@ -1103,23 +1124,20 @@ install_qa_check_macho() {
 			# remember we are in an implicit subshell, that's
 			# why we touch a file here ... ideally we should be
 			# able to die correctly/nicely here
-			touch "${T}"/.install_name_check_failed
+			[[ -z ${ignore} && touch "${T}"/.install_name_check_failed
 		fi
 
 		# this is ugly, paths with spaces won't work
 		for lib in ${needed//,/ } ; do
 			if [[ ${lib} == ${D}* ]] ; then
 				eqawarn "QA Notice: install_name references \${D}: ${lib} in ${obj}"
-				touch "${T}"/.install_name_check_failed
+				[[ -z ${ignore} && touch "${T}"/.install_name_check_failed
 			elif [[ ${lib} == ${S}* ]] ; then
 				eqawarn "QA Notice: install_name references \${S}: ${lib} in ${obj}"
-				touch "${T}"/.install_name_check_failed
+				[[ -z ${ignore} && touch "${T}"/.install_name_check_failed
 			elif ! install_name_is_relative ${lib} && [[ ! -e ${lib} && ! -e ${D}${lib} ]] ; then
 				eqawarn "QA Notice: invalid reference to ${lib} in ${obj}"
-				# remember we are in an implicit subshell, that's
-				# why we touch a file here ... ideally we should be
-				# able to die correctly/nicely here
-				touch "${T}"/.install_name_check_failed
+				[[ -z ${ignore} && touch "${T}"/.install_name_check_failed
 			fi
 		done
 

diff --git a/man/ebuild.5 b/man/ebuild.5
index 89bd6a2..708e9d4 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -777,6 +777,12 @@ characters.
 This variable is intended to be used on files of binary packages which ignore
 CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, and LDFLAGS variables.
 .TP
+.B QA_IGNORE_INSTALL_NAME_FILES
+This should contain a list of file names (without path) that should be
+ignored in the install_name check.  That is, if these files point to
+something not available in the image directory or live filesystem, these
+files are ignored, albeit being broken.
+.TP
 .B QA_MULTILIB_PATHS
 This should contain a list of file paths, relative to the image directory, of
 files that should be ignored for the multilib\-strict checks.