| 1 |
commit: a164fd421a445bb12c1b2f127600d915cb4df057 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 21 20:03:45 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 21 20:03:45 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a164fd42 |
| 7 |
|
| 8 |
s/QA_DT_SWITCHES/QA_CFLAGS_IGNORED/ |
| 9 |
|
| 10 |
--- |
| 11 |
bin/misc-functions.sh | 10 +++++----- |
| 12 |
man/ebuild.5 | 2 +- |
| 13 |
man/make.conf.5 | 2 +- |
| 14 |
3 files changed, 7 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
| 17 |
index b6bd8ed..4a1a223 100755 |
| 18 |
--- a/bin/misc-functions.sh |
| 19 |
+++ b/bin/misc-functions.sh |
| 20 |
@@ -311,20 +311,20 @@ install_qa_check() { |
| 21 |
# Check for files built without respecting CFLAGS |
| 22 |
if [[ "${CFLAGS}" == *-frecord-gcc-switches* ]] && \ |
| 23 |
! has binchecks ${RESTRICT} ; then |
| 24 |
- qa_var="QA_DT_SWITCHES_${ARCH/-/_}" |
| 25 |
- eval "[[ -n \${!qa_var} ]] && QA_DT_SWITCHES=(\"\${${qa_var}[@]}\")" |
| 26 |
+ qa_var="QA_CFLAGS_IGNORED_${ARCH/-/_}" |
| 27 |
+ eval "[[ -n \${!qa_var} ]] && QA_CFLAGS_IGNORED=(\"\${${qa_var}[@]}\")" |
| 28 |
f=$(scanelf -qyRF '%k %p' -k \!.GCC.command.line "${ED}" | sed -e "s:\!.GCC.command.line ::") |
| 29 |
if [[ -n ${f} ]] ; then |
| 30 |
echo "${f}" > "${T}"/scanelf-ignored-CFLAGS.log |
| 31 |
if [ "${QA_STRICT_DT_SWITCHES-unset}" == unset ] ; then |
| 32 |
- if [[ ${#QA_DT_SWITCHES[@]} -gt 1 ]] ; then |
| 33 |
- for x in "${QA_DT_SWITCHES[@]}" ; do |
| 34 |
+ if [[ ${#QA_CFLAGS_IGNORED[@]} -gt 1 ]] ; then |
| 35 |
+ for x in "${QA_CFLAGS_IGNORED[@]}" ; do |
| 36 |
sed -e "s#^${x#/}\$##" -i "${T}"/scanelf-ignored-CFLAGS.log |
| 37 |
done |
| 38 |
else |
| 39 |
local shopts=$- |
| 40 |
set -o noglob |
| 41 |
- for x in ${QA_DT_SWITCHES} ; do |
| 42 |
+ for x in ${QA_CFLAGS_IGNORED} ; do |
| 43 |
sed -e "s#^${x#/}\$##" -i "${T}"/scanelf-ignored-CFLAGS.log |
| 44 |
done |
| 45 |
set +o noglob |
| 46 |
|
| 47 |
diff --git a/man/ebuild.5 b/man/ebuild.5 |
| 48 |
index 1216ac1..a9a26a7 100644 |
| 49 |
--- a/man/ebuild.5 |
| 50 |
+++ b/man/ebuild.5 |
| 51 |
@@ -602,7 +602,7 @@ This should contain a list of file paths, relative to the image directory, of |
| 52 |
files that contain writable and executable segments. These are rare. |
| 53 |
The paths may contain fnmatch patterns. |
| 54 |
.TP |
| 55 |
-\fBQA_DT_SWITCHES\fR |
| 56 |
+\fBQA_CFLAGS_IGNORED\fR |
| 57 |
This should contain a list of file paths, relative to the image directory, of |
| 58 |
files that do not contain .GCC.command.line sections. The paths may contain |
| 59 |
regular expressions with escape\-quoted special characters. |
| 60 |
|
| 61 |
diff --git a/man/make.conf.5 b/man/make.conf.5 |
| 62 |
index f9d69b7..86b4d4b 100644 |
| 63 |
--- a/man/make.conf.5 |
| 64 |
+++ b/man/make.conf.5 |
| 65 |
@@ -815,7 +815,7 @@ Set this to cause portage to ignore any \fIQA_TEXTREL\fR override |
| 66 |
settings from ebuilds. See also \fBebuild\fR(5). |
| 67 |
.TP |
| 68 |
\fBQA_STRICT_DT_SWITCHES = \fI"set"\fR |
| 69 |
-Set this to cause portage to ignore any \fIQA_DT_SWITCHES\fR override |
| 70 |
+Set this to cause portage to ignore any \fIQA_CFLAGS_IGNORED\fR override |
| 71 |
settings from ebuilds. See also \fBebuild\fR(5). |
| 72 |
.TP |
| 73 |
\fBQA_STRICT_DT_HASH = \fI"set"\fR |
Archives