| 1 |
commit: fb2c8202c7d12666f0e570bfde1fdaf385dff6d8 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 28 16:24:50 2014 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 28 16:24:50 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fb2c8202 |
| 7 |
|
| 8 |
Revert "install_qa_check_macho: introduce QA_INSTALL_NAME" |
| 9 |
|
| 10 |
Consensus said this was not the right way to go. See follow-up commit. |
| 11 |
|
| 12 |
This reverts commit 90691e509210bce88c715022eaba72fac5cf76b5. |
| 13 |
|
| 14 |
--- |
| 15 |
bin/misc-functions.sh | 22 +--------------------- |
| 16 |
man/ebuild.5 | 5 ----- |
| 17 |
2 files changed, 1 insertion(+), 26 deletions(-) |
| 18 |
|
| 19 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
| 20 |
index 6088966..9ce9df6 100644 |
| 21 |
--- a/bin/misc-functions.sh |
| 22 |
+++ b/bin/misc-functions.sh |
| 23 |
@@ -1098,27 +1098,7 @@ install_qa_check_macho() { |
| 24 |
fi |
| 25 |
done |
| 26 |
fi |
| 27 |
- |
| 28 |
- ignore= |
| 29 |
- qa_var="QA_INSTALL_NAME_${ARCH/-/_}" |
| 30 |
- eval "[[ -n \${!qa_var} ]] && QA_INSTALL_NAME=(\"\${${qa_var}[@]}\")" |
| 31 |
- if [[ ${#QA_INSTALL_NAME[@]} -gt 1 ]] ; then |
| 32 |
- for x in "${QA_INSTALL_NAME[@]}" ; do |
| 33 |
- [[ ${EPREFIX}/${x#/} == ${install_name} ]] && \ |
| 34 |
- ignore=true |
| 35 |
- done |
| 36 |
- else |
| 37 |
- local shopts=$- |
| 38 |
- set -o noglob |
| 39 |
- for x in ${QA_INSTALL_NAME} ; do |
| 40 |
- [[ ${EPREFIX}/${x#/} == ${install_name} ]] && \ |
| 41 |
- ignore=true |
| 42 |
- done |
| 43 |
- set +o noglob |
| 44 |
- set -${shopts} |
| 45 |
- fi |
| 46 |
- |
| 47 |
- if [[ -z ${ignore} && ! -e ${D}${install_name} ]] ; then |
| 48 |
+ if [[ ! -e ${D}${install_name} ]] ; then |
| 49 |
eqawarn "QA Notice: invalid self-reference install_name ${install_name} in ${obj}" |
| 50 |
# remember we are in an implicit subshell, that's |
| 51 |
# why we touch a file here ... ideally we should be |
| 52 |
|
| 53 |
diff --git a/man/ebuild.5 b/man/ebuild.5 |
| 54 |
index ad6bf40..89bd6a2 100644 |
| 55 |
--- a/man/ebuild.5 |
| 56 |
+++ b/man/ebuild.5 |
| 57 |
@@ -799,11 +799,6 @@ shared libraries that have SONAMEs but should not have a corresponding SONAME |
| 58 |
symlink in the same directory. The paths may contain regular expressions |
| 59 |
with escape\-quoted special characters. |
| 60 |
.TP |
| 61 |
-.B QA_INSTALL_NAME |
| 62 |
-This should contain a list of install_names (excluding leading EPREFIX |
| 63 |
-or EROOT) of shared libraries that are allowed, despite pointing to |
| 64 |
-something not available in the image directory. |
| 65 |
-.TP |
| 66 |
.B QA_AM_MAINTAINER_MODE |
| 67 |
This should contain a list of lines containing automake missing \-\-run |
| 68 |
commands. The lines may contain regular expressions with escape\-quoted |
Archives