From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RdSOs-0006oI-Px for garchives@archives.gentoo.org; Wed, 21 Dec 2011 20:04:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFACD21C0F3; Wed, 21 Dec 2011 20:04:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B217721C0F3 for ; Wed, 21 Dec 2011 20:04:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E5371B4021 for ; Wed, 21 Dec 2011 20:04:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5C5C780042 for ; Wed, 21 Dec 2011 20:04:21 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: man/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh man/ebuild.5 man/make.conf.5 X-VCS-Directories: man/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a164fd421a445bb12c1b2f127600d915cb4df057 Date: Wed, 21 Dec 2011 20:04:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4df99fac-dd6f-4f85-8218-e18b7cd68c05 X-Archives-Hash: ebad336faf24bde92f44e40736e32a03 commit: a164fd421a445bb12c1b2f127600d915cb4df057 Author: Zac Medico gentoo org> AuthorDate: Wed Dec 21 20:03:45 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Dec 21 20:03:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da164fd42 s/QA_DT_SWITCHES/QA_CFLAGS_IGNORED/ --- bin/misc-functions.sh | 10 +++++----- man/ebuild.5 | 2 +- man/make.conf.5 | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index b6bd8ed..4a1a223 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -311,20 +311,20 @@ install_qa_check() { # Check for files built without respecting CFLAGS if [[ "${CFLAGS}" =3D=3D *-frecord-gcc-switches* ]] && \ ! has binchecks ${RESTRICT} ; then - qa_var=3D"QA_DT_SWITCHES_${ARCH/-/_}" - eval "[[ -n \${!qa_var} ]] && QA_DT_SWITCHES=3D(\"\${${qa_var}[@]}\")= " + qa_var=3D"QA_CFLAGS_IGNORED_${ARCH/-/_}" + eval "[[ -n \${!qa_var} ]] && QA_CFLAGS_IGNORED=3D(\"\${${qa_var}[@]}= \")" f=3D$(scanelf -qyRF '%k %p' -k \!.GCC.command.line "${ED}" | sed -e "= s:\!.GCC.command.line ::") if [[ -n ${f} ]] ; then echo "${f}" > "${T}"/scanelf-ignored-CFLAGS.log if [ "${QA_STRICT_DT_SWITCHES-unset}" =3D=3D unset ] ; then - if [[ ${#QA_DT_SWITCHES[@]} -gt 1 ]] ; then - for x in "${QA_DT_SWITCHES[@]}" ; do + if [[ ${#QA_CFLAGS_IGNORED[@]} -gt 1 ]] ; then + for x in "${QA_CFLAGS_IGNORED[@]}" ; do sed -e "s#^${x#/}\$##" -i "${T}"/scanelf-ignored-CFLAGS.log done else local shopts=3D$- set -o noglob - for x in ${QA_DT_SWITCHES} ; do + for x in ${QA_CFLAGS_IGNORED} ; do sed -e "s#^${x#/}\$##" -i "${T}"/scanelf-ignored-CFLAGS.log done set +o noglob diff --git a/man/ebuild.5 b/man/ebuild.5 index 1216ac1..a9a26a7 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -602,7 +602,7 @@ This should contain a list of file paths, relative to= the image directory, of files that contain writable and executable segments. These are rare. The paths may contain fnmatch patterns. .TP -\fBQA_DT_SWITCHES\fR +\fBQA_CFLAGS_IGNORED\fR This should contain a list of file paths, relative to the image director= y, of files that do not contain .GCC.command.line sections. The paths may cont= ain regular expressions with escape\-quoted special characters. diff --git a/man/make.conf.5 b/man/make.conf.5 index f9d69b7..86b4d4b 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -815,7 +815,7 @@ Set this to cause portage to ignore any \fIQA_TEXTREL= \fR override settings from ebuilds. See also \fBebuild\fR(5). .TP \fBQA_STRICT_DT_SWITCHES =3D \fI"set"\fR -Set this to cause portage to ignore any \fIQA_DT_SWITCHES\fR override +Set this to cause portage to ignore any \fIQA_CFLAGS_IGNORED\fR override settings from ebuilds. See also \fBebuild\fR(5). .TP \fBQA_STRICT_DT_HASH =3D \fI"set"\fR